diff --git a/Star Wars FFG API-Compatible/Character Sheet Preview.jpg b/Star Wars FFG API-Compatible/Character Sheet Preview.jpg
deleted file mode 100644
index 342257e37e..0000000000
Binary files a/Star Wars FFG API-Compatible/Character Sheet Preview.jpg and /dev/null differ
diff --git a/Star Wars FFG API-Compatible/Character Sheet Preview.png b/Star Wars FFG API-Compatible/Character Sheet Preview.png
new file mode 100644
index 0000000000..a494255228
Binary files /dev/null and b/Star Wars FFG API-Compatible/Character Sheet Preview.png differ
diff --git a/Star Wars FFG API-Compatible/FFG-SWRPG-CharacterSheet.html b/Star Wars FFG API-Compatible/FFG-SWRPG-CharacterSheet.html
index d0da50296f..6ec3b99b35 100644
--- a/Star Wars FFG API-Compatible/FFG-SWRPG-CharacterSheet.html	
+++ b/Star Wars FFG API-Compatible/FFG-SWRPG-CharacterSheet.html	
@@ -1,8 +1,12 @@
 <!--
 Version Info:
-Version 4.0.4.2
+Version 4.0.4.4
     Recent Change(s):
-        Redesign of Old Vehicle Tabs
+        Code cleanup
+        Added method to hide old Vehicle Tab
+        Fixed Spelling Mistakes
+        Removed max thresholds that were identified as being too low
+        Fixed typos in group sheet that copied variables to different areas
 -->
 <!--Is the Sheet for the Player or GM?-->
 <input type="radio" name="attr_gmdicepool" class="sheet-player" value="1" checked="checked" style="display:none">
@@ -19,7 +23,7 @@ Version 4.0.4.2
             </tr>
         </table><br />
     </div>
-</div>
+</div><!--Header & Game Line Pictures-->
 
 <!--Player Sheet Tabs-->
 <input type="radio" name="attr_pcgm" class="sheet-tab-new sheet-tab-character-sheet sheet-player-sheet" value="1" checked="checked" />
@@ -30,8 +34,6 @@ Version 4.0.4.2
 <span class="sheet-tab-new sheet-player-sheet">Group Sheet</span>
 <input type="radio" name="attr_pcgm" class="sheet-tab-new sheet-tab-companion-sheet sheet-player-sheet" value="4" />
 <span class="sheet-tab-new sheet-player-sheet">Companion Sheet</span>
-<input type="radio" name="attr_pcgm" class="sheet-tab-new sheet-tab-older sheet-player-sheet" value="6" />
-<span class="sheet-tab-new sheet-player-sheet">Old Vehicle Sheet</span>
 
 <!--GM Sheet Tabs-->
 <input type="radio" name="attr_pcgm" class="sheet-tab-new sheet-tab-gm-dice sheet-gm-sheet" value="5" />
@@ -46,15 +48,15 @@ Version 4.0.4.2
                     <tr>
                         <td>
                             <label class="sheet-label-title">Wounds</label>
-                            <input name="attr_wounds_max" type="number" max="999" min="1" value="1" />
-                            <input name="attr_wounds" type="number" max="999" min="0" value="0" /><br />
+                            <input name="attr_wounds_max" type="number" min="1" value="1" />
+                            <input name="attr_wounds" type="number" min="0" value="0" /><br />
                             <label class="sheet-label-threshold">Threshold</label>
                             <label class="sheet-label-current">Current</label>
                         </td>
                         <td>
                             <label class="sheet-label-title">Strain</label>
-                            <input name="attr_strain_max" type="number" max="99" min="1" value="1" />
-                            <input name="attr_strain" type="number" max="99" min="0" value="0" /><br />
+                            <input name="attr_strain_max" type="number" min="1" value="1" />
+                            <input name="attr_strain" type="number" min="0" value="0" /><br />
                             <label class="sheet-label-threshold">Threshold</label>
                             <label class="sheet-label-current">Current</label>
                         </td>
@@ -67,9 +69,9 @@ Version 4.0.4.2
                         </td>
                         <td rowspan="2">
                             <label class="sheet-label-title">Encum</label>
-                            <input name="attr_encumbrance_max" type="number" max="40" min="1" value="1" />
+                            <input name="attr_encumbrance_max" type="number" min="1" value="1" />
                             <input name="attr_encumbrancemax" type="hidden" value="@{encumbrance|max}" disabled />
-                            <input name="attr_encumbrance" type="number" max="40" min="0" value="0" /><br />-->
+                            <input name="attr_encumbrance" type="number" min="0" value="0" /><br />-->
                             <label class="sheet-label-threshold">Threshold</label>
                             <label class="sheet-label-current">Current</label>
                         </td>
@@ -191,6 +193,7 @@ Version 4.0.4.2
                             <td width="15%"><label>Species:</label></td>
                             <td width="35%">
                                 <select name='attr_species'>
+                                    <option>&emsp;&emsp;</option>
                                     <option value="Aqualish (Aquala)">Aqualish (Aquala)</option>
                                     <option value="Aqualish (Quara)">Aqualish (Quara)</option>
                                     <option value="Aqualish (Ualaq)">Aqualish (Ualaq)</option>
@@ -247,7 +250,7 @@ Version 4.0.4.2
                                     <option value="Verpine">Verpine</option>
                                     <option value="Weequay">Weequay</option>
                                     <option value="Whiphid">Whiphid</option>
-                                    <option value="Wookie">Wookie</option>
+                                    <option value="Wookiee">Wookiee</option>
                                     <option value="Xexto">Xexto</option>
                                     <option value="Zabrak">Zabrak</option>
                                 </select><!--Species List-->
@@ -281,16 +284,12 @@ Version 4.0.4.2
                                             <span class="sheet-icon-question">?</span>
                                         </div>
                                         <div class="sheet-help-content" style="margin-left:-225px">
-                                            <p>
-                                                This section is to have you list your specializations
-                                            </p>
+                                            <p>This section is to have you list your specializations</p>
                                             <p>
                                                 Career - Indicates the Career the Specilization
                                                 came from
                                             </p>
-                                            <p>
-                                                Specialization - Indicates the name of the Specs
-                                            </p>
+                                            <p>Specialization - Indicates the name of the Specs</p>
                                             <p>
                                                 Is it in your Career? - This is to list if it is an out
                                                 of career Specialization and thus adds an
@@ -4527,6 +4526,708 @@ Version 4.0.4.2
     <span class="sheet-tab-new">&emsp;Planetary&emsp;</span>
     <input type="radio" name="attr_v-sheet" class="sheet-tab-new sheet-tab-transport-beast" value="3" />
     <span class="sheet-tab-new">&emsp;Beast&emsp;</span>
+    <div class="sheet-small-12 sheet-column">
+        <br />
+        <br />
+        <div class="sheet-clear"></div>
+        <div class="sheet-attachments-wrapper">
+            <input type="checkbox" name="attr_old-vehicle-tabs" class="sheet-view-attachments" />
+            <label class="sheet-view-attachments">Show Old Vehicle Tabs</label>
+            <table class="sheet-attachments" cellspacing="0" cellpadding="0" border="0">
+                <tbody>
+                    <tr>
+                        <td>
+                            <div>
+                                <div class="sheet-row">
+                                    <div class="sheet-small-12 sheet-column">
+                                        <table class="sheet-ship" cellspacing="0" cellpadding="0" border="0">
+                                            <tr>
+                                                <td class="sheet-ship-char-bg">
+                                                    <label>Silhouette</label>
+                                                    <input name='attr_silhouette' type="number" max="99" min="0" value="0" />
+                                                </td>
+                                                <td class="sheet-ship-char-thre-bg-speed">
+                                                    <label class="sheet-label-title">Speed</label>
+                                                    <input name="attr_speed" type="number" max="99" min="-99" value="0" />
+                                                    <input name="attr_speed_current" type="number" max="99" min="-99" value="0" /><br />
+                                                    <label class="sheet-label-threshold-speed">Max</label>
+                                                    <label class="sheet-label-current-speed">Current</label>
+                                                </td>
+                                                <td class="sheet-ship-char-bg">
+                                                    <label>Handling</label>
+                                                    <input name='attr_handling' type="number" max="99" min="0" value="0" />
+                                                </td>
+                                                <td rowspan="2" class="sheet-ship-defense">
+                                                    <div style="width:302px; height:1px;"></div>
+                                                    <label class="sheet-def-label">Defense</label>
+                                                    <div class="sheet-fore">
+                                                        <label>Fore</label>
+                                                        <input name='attr_deffore' type="number" max="99" min="0" value="0" />
+                                                    </div>
+                                                    <div class="sheet-starboard">
+                                                        <label>Starboard</label>
+                                                        <input name='attr_defstarboard' type="number" max="99" min="0" value="0" />
+                                                    </div>
+                                                    <div class="sheet-aft">
+                                                        <label>Aft</label>
+                                                        <input name='attr_defaft' type="number" max="99" min="0" value="0" />
+                                                    </div>
+                                                    <div class="sheet-port">
+                                                        <label>Port</label>
+                                                        <input name='attr_defport' type="number" max="99" min="0" value="0" />
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td class="sheet-ship-char-thre-bg">
+                                                    <label class="sheet-label-title">Armor</label>
+                                                    <input name="attr_ship_armor" type="number" max="99" min="-99" value="0">
+                                                </td>
+                                                <td class="sheet-ship-char-thre-bg">
+                                                    <label class="sheet-label-title">Hull Trauma</label>
+                                                    <input name="attr_hull_trauma_max" type="number" max="99" min="-99" value="0" />
+                                                    <input name="attr_hull_trauma" type="number" max="99" min="-99" value="0" /><br />
+                                                    <label class="sheet-label-threshold">Threshold</label>
+                                                    <label class="sheet-label-current">Current</label>
+                                                </td>
+                                                <td class="sheet-ship-char-thre-bg">
+                                                    <label class="sheet-label-title">Sys Strain</label>
+                                                    <input name="attr_system_strain_max" type="number" max="99" min="-99" value="0" />
+                                                    <input name="attr_system_strain" type="number" max="99" min="-99" value="0" /><br />
+                                                    <label class="sheet-label-threshold">Threshold</label>
+                                                    <label class="sheet-label-current">Current</label>
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    </div><!-- end column -->
+                                    <div class="sheet-clear"></div>
+                                </div><!-- Depreciated Vehicle Top Stats -->
+
+                                <input type="radio" name="attr_old-sheet" class="sheet-tab-new sheet-tab-v-details" value="1" checked="checked" />
+                                <span class="sheet-tab-new">&emsp;Details&emsp;</span>
+                                <input type="radio" name="attr_old-sheet" class="sheet-tab-new sheet-tab-v-weapons" value="2" />
+                                <span class="sheet-tab-new">&emsp;Weapons&emsp;</span>
+
+                                <div class="sheet-tab-content sheet-tab-v-details">
+                                    <div class="sheet-row">
+                                        <div class="sheet-small-12 sheet-column">
+                                            <br />
+                                            <input type="radio" name="attr_opt-vehicle-ship" class="sheet-opt sheet-opt-vehicle" value="1" title="Vehicle" checked="checked" />
+                                            <input type="radio" name="attr_opt-vehicle-ship" class="sheet-opt sheet-opt-ship" value="2" title="Ship" />
+                                            <br /><br />
+                                            <h3 class="sheet-section-header">Details</h3>
+                                            <table cellspacing="0" cellpadding="0" border="0">
+                                                <tbody>
+                                                    <tr>
+                                                        <td><label>Name:</label></td>
+                                                        <td><input name="attr_v-s-name" type="text" /></td>
+                                                        <td><label>Hard Points:</label></td>
+                                                        <td><input name="attr_hard-points" type="text" /></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="sheet-opt-content sheet-opt-vehicle"><label>Vehicle Type/Model:</label></td>
+                                                        <td class="sheet-opt-content sheet-opt-vehicle"><input name="attr_vehicle-type-model" type="text" /></td>
+                                                        <td class="sheet-opt-content sheet-opt-ship"><label>Hull Type/Class:</label></td>
+                                                        <td class="sheet-opt-content sheet-opt-ship"><input name="attr_hull-type-class" type="text" /></td>
+                                                        <td><label>Sensor Range:</label></td>
+                                                        <td>
+                                                            <select name="attr_sensor-range">
+                                                                <option value="none">None</option>
+                                                                <option value="Close">Close</option>
+                                                                <option value="Short">Short</option>
+                                                                <option value="Medium">Medium</option>
+                                                                <option value="Long">Long</option>
+                                                                <option value="Extreme">Extreme</option>
+                                                            </select>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td><label>Manufacturer:</label></td>
+                                                        <td><input name="attr_manufacturer" type="text" /></td>
+                                                        <td><label>Encumbrance Capacity:</label></td>
+                                                        <td><input name="attr_encum-capacity" type="text" /></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td><label>Passenger Capacity:</label></td>
+                                                        <td><input name="attr_pass-capacity" type="text" /></td>
+                                                        <td class="sheet-opt-content sheet-opt-vehicle"><label>Maximum Altitude:</label></td>
+                                                        <td class="sheet-opt-content sheet-opt-vehicle"><input name="attr_vehicle-max-altiude" type="text" /></td>
+                                                        <td class="sheet-opt-content sheet-opt-ship"><label>Navicomputer: </label></td>
+                                                        <td class="sheet-opt-content sheet-opt-ship"><input name="attr_ship-navicomputer" type="checkbox" value="1" /></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="sheet-opt-content sheet-opt-vehicle"><label>Crew:</label></td>
+                                                        <td class="sheet-opt-content sheet-opt-vehicle"><input name="attr_vehicle-crew" type="text" /></td>
+                                                        <td class="sheet-opt-content sheet-opt-vehicle" colspan="2">&nbsp;</td>
+                                                        <td class="sheet-opt-content sheet-opt-ship"><label>Ship's Complement:</label></td>
+                                                        <td class="sheet-opt-content sheet-opt-ship"><input name="attr_ships-complement" type="text" /></td>
+                                                        <td class="sheet-opt-content sheet-opt-ship"><label>Hyperdrive Primary Class:</label></td>
+                                                        <td class="sheet-opt-content sheet-opt-ship"><input name="attr_hyperdrive-primary" type="text" /></td>
+                                                    </tr>
+                                                    <tr class="sheet-opt-content sheet-opt-ship">
+                                                        <td><label>Consumables:</label></td>
+                                                        <td><input name="attr_ship-consumables" type="text" /></td>
+                                                        <td><label>Hyperdrive Backup Class:</label></td>
+                                                        <td><input name="attr_hyperdrive-backup" type="text" /></td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                            <br />
+                                        </div><!-- end column -->
+                                        <div class="sheet-clear"></div>
+                                    </div><!-- Vehicle General Info -->
+                                    <div class="sheet-row">
+                                        <div class="sheet-small-12 sheet-column">
+                                            <h3 class="sheet-section-header">Attachments</h3>
+                                            <table cellspacing="0" cellpadding="0" border="0">
+                                                <thead>
+                                                    <tr>
+                                                        <th style="width:25%">Name</th>
+                                                        <th style="width:25%">Hard points</th>
+                                                        <th style="width:25%">Base Modifiers</th>
+                                                        <th style="width:25%">Modifications</th>
+                                                    </tr>
+                                                </thead>
+                                            </table>
+                                            <fieldset class="repeating_shipAttachments">
+                                                <table cellspacing="0" cellpadding="0" border="0">
+                                                    <tbody>
+                                                        <tr>
+                                                            <td style="width:25%"><input name='attr_shipAttachName' type="text" /></td>
+                                                            <td style="width:25%"><input name='attr_shipAttachHP' type="text" /></td>
+                                                            <td style="width:25%"><input name='attr_shipAttachBaseMod' type="text" /></td>
+                                                            <td style="width:25%"><input name='attr_shipAttachMod' type="text" /></td>
+                                                        </tr>
+                                                    </tbody>
+                                                </table>
+                                            </fieldset>
+                                        </div>
+                                        <div class="sheet-clear"></div>
+                                    </div><!-- Vehicle Attachments -->
+                                    <div class="sheet-row sheet-show-critical-table">
+                                        <div class="sheet-small-12 sheet-column">
+                                            <h3 class="sheet-section-header">Vehicle Critical</h3>
+                                        </div><!-- column -->
+                                        <div class="sheet-small-9 sheet-column">
+                                            <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn1" value="1" />
+                                            <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
+                                                <tbody>
+                                                    <tr>
+                                                        <td width="70%"><input type="text" name="attr_critShipName1" readonly="readonly" /></td>
+                                                        <td width="30%"><input type="text" name="attr_critShipRange1" readonly="readonly" /></td>
+                                                        <td class="sheet-crit-dice-bg">
+                                                            <input type="hidden" name="attr_critShipDice1" />
+                                                            <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity1" /><span></span>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td colspan="2" rowspan="2"><textarea row="3" name="attr_critShipSummary1" readonly="readonly"></textarea></td>
+                                                        <td>
+                                                            <label>Effect:</label>
+                                                            <div class="sheet-switch">
+                                                                <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect1" value="on" title="On" checked="checked">
+                                                                <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect1" value="off" title="Off">
+                                                                <span class="switch-selection"></span>
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                            <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn2" value="2" />
+                                            <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
+                                                <tbody>
+                                                    <tr>
+                                                        <td width="70%"><input type="text" name="attr_critShipName2" readonly="readonly" /></td>
+                                                        <td width="30%"><input type="text" name="attr_critShipRange2" readonly="readonly" /></td>
+                                                        <td class="sheet-crit-dice-bg">
+                                                            <input type="hidden" name="attr_critShipDice2" />
+                                                            <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity2" /><span></span>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary2" readonly="readonly" /></td>
+                                                        <td>
+                                                            <label>Effect:</label>
+                                                            <div class="sheet-switch">
+                                                                <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect2" value="on" title="On" checked="checked">
+                                                                <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect2" value="off" title="Off">
+                                                                <span class="switch-selection"></span>
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                    <tr></tr>
+                                                </tbody>
+                                            </table>
+                                            <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn3" value="3" />
+                                            <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
+                                                <tbody>
+                                                    <tr>
+                                                        <td width="70%"><input type="text" name="attr_critShipName3" readonly="readonly" /></td>
+                                                        <td width="30%"><input type="text" name="attr_critShipRange3" readonly="readonly" /></td>
+                                                        <td class="sheet-crit-dice-bg">
+                                                            <input type="hidden" name="attr_critShipDice3" />
+                                                            <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity3" /><span></span>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary3" readonly="readonly" /></td>
+                                                        <td>
+                                                            <label>Effect:</label>
+                                                            <div class="sheet-switch">
+                                                                <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect3" value="on" title="On" checked="checked">
+                                                                <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect3" value="off" title="Off">
+                                                                <span class="switch-selection"></span>
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                            <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn4" value="4" />
+                                            <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
+                                                <tbody>
+                                                    <tr>
+                                                        <td width="70%"><input type="text" name="attr_critShipName4" readonly="readonly" /></td>
+                                                        <td width="30%"><input type="text" name="attr_critShipRange4" readonly="readonly" /></td>
+                                                        <td class="sheet-crit-dice-bg">
+                                                            <input type="hidden" name="attr_critShipDice4" />
+                                                            <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity4" /><span></span>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary4" readonly="readonly" /></td>
+                                                        <td>
+                                                            <label>Effect:</label>
+                                                            <div class="sheet-switch">
+                                                                <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect4" value="on" title="On" checked="checked">
+                                                                <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect4" value="off" title="Off">
+                                                                <span class="switch-selection"></span>
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                            <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn5" value="5" />
+                                            <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
+                                                <tbody>
+                                                    <tr>
+                                                        <td width="70%"><input type="text" name="attr_critShipName5" readonly="readonly" /></td>
+                                                        <td width="30%"><input type="text" name="attr_critShipRange5" readonly="readonly" /></td>
+                                                        <td class="sheet-crit-dice-bg">
+                                                            <input type="hidden" name="attr_critShipDice5" />
+                                                            <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity5" /><span></span>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary5" readonly="readonly" /></td>
+                                                        <td>
+                                                            <label>Effect:</label>
+                                                            <div class="sheet-switch">
+                                                                <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect5" value="on" title="On" checked="checked">
+                                                                <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect5" value="off" title="Off">
+                                                                <span class="switch-selection"></span>
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                            <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn6" value="6" />
+                                            <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
+                                                <tbody>
+                                                    <tr>
+                                                        <td width="70%"><input type="text" name="attr_critShipName6" readonly="readonly" /></td>
+                                                        <td width="30%"><input type="text" name="attr_critShipRange6" readonly="readonly" /></td>
+                                                        <td class="sheet-crit-dice-bg">
+                                                            <input type="hidden" name="attr_critShipDice6" />
+                                                            <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity6" /><span></span>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary6" readonly="readonly" /></td>
+                                                        <td>
+                                                            <label>Effect:</label>
+                                                            <div class="sheet-switch">
+                                                                <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect6" value="on" title="On" checked="checked">
+                                                                <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect6" value="off" title="Off">
+                                                                <span class="switch-selection"></span>
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                            <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn7" value="7" />
+                                            <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
+                                                <tbody>
+                                                    <tr>
+                                                        <td width="70%"><input type="text" name="attr_critShipName7" readonly="readonly" /></td>
+                                                        <td width="30%"><input type="text" name="attr_critShipRange7" readonly="readonly" /></td>
+                                                        <td class="sheet-crit-dice-bg">
+                                                            <input type="hidden" name="attr_critShipDice7" />
+                                                            <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity7" /><span></span>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary7" readonly="readonly" /></td>
+                                                        <td>
+                                                            <label>Effect:</label>
+                                                            <div class="sheet-switch">
+                                                                <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect7" value="on" title="On" checked="checked">
+                                                                <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect7" value="off" title="Off">
+                                                                <span class="switch-selection"></span>
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                            <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn8" value="8" />
+                                            <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
+                                                <tbody>
+                                                    <tr>
+                                                        <td width="70%"><input type="text" name="attr_critShipName8" readonly="readonly" /></td>
+                                                        <td width="30%"><input type="text" name="attr_critShipRange8" readonly="readonly" /></td>
+                                                        <td class="sheet-crit-dice-bg">
+                                                            <input type="hidden" name="attr_critShipDice8" />
+                                                            <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity8" /><span></span>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary8" readonly="readonly" /></td>
+                                                        <td>
+                                                            <label>Effect:</label>
+                                                            <div class="sheet-switch">
+                                                                <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect8" value="on" title="On" checked="checked">
+                                                                <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect8" value="off" title="Off">
+                                                                <span class="switch-selection"></span>
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                            <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn9" value="9" />
+                                            <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
+                                                <tbody>
+                                                    <tr>
+                                                        <td width="70%"><input type="text" name="attr_critShipName9" readonly="readonly" /></td>
+                                                        <td width="30%"><input type="text" name="attr_critShipRange9" readonly="readonly" /></td>
+                                                        <td class="sheet-crit-dice-bg">
+                                                            <input type="hidden" name="attr_critShipDice9" />
+                                                            <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity9" /><span></span>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary9" readonly="readonly" /></td>
+                                                        <td>
+                                                            <label>Effect:</label>
+                                                            <div class="sheet-switch">
+                                                                <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect9" value="on" title="On" checked="checked">
+                                                                <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect9" value="off" title="Off">
+                                                                <span class="switch-selection"></span>
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                            <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn10" value="10" />
+                                            <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
+                                                <tbody>
+                                                    <tr>
+                                                        <td width="70%"><input type="text" name="attr_critShipName10" readonly="readonly" /></td>
+                                                        <td width="30%"><input type="text" name="attr_critShipRange10" readonly="readonly" /></td>
+                                                        <td class="sheet-crit-dice-bg">
+                                                            <input type="hidden" name="attr_critShipDice10" />
+                                                            <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity10" /><span></span>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary10" readonly="readonly" /></td>
+                                                        <td>
+                                                            <label>Effect:</label>
+                                                            <div class="sheet-switch">
+                                                                <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect10" value="on" title="On" checked="checked">
+                                                                <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect10" value="off" title="Off">
+                                                                <span class="switch-selection"></span>
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                            <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn11" value="11" />
+                                            <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
+                                                <tbody>
+                                                    <tr>
+                                                        <td width="70%"><input type="text" name="attr_critShipName11" readonly="readonly" /></td>
+                                                        <td width="30%"><input type="text" name="attr_critShipRange11" readonly="readonly" /></td>
+                                                        <td class="sheet-crit-dice-bg">
+                                                            <input type="hidden" name="attr_critShipDice11" />
+                                                            <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity11" /><span></span>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary11" readonly="readonly" /></td>
+                                                        <td>
+                                                            <label>Effect:</label>
+                                                            <div class="sheet-switch">
+                                                                <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect11" value="on" title="On" checked="checked">
+                                                                <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect11" value="off" title="Off">
+                                                                <span class="switch-selection"></span>
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                            <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn12" value="12" />
+                                            <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
+                                                <tbody>
+                                                    <tr>
+                                                        <td width="70%"><input type="text" name="attr_critShipName12" readonly="readonly" /></td>
+                                                        <td width="30%"><input type="text" name="attr_critShipRange12" readonly="readonly" /></td>
+                                                        <td class="sheet-crit-dice-bg">
+                                                            <input type="hidden" name="attr_critShipDice12" />
+                                                            <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity12" /><span></span>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary12" readonly="readonly" /></td>
+                                                        <td>
+                                                            <label>Effect:</label>
+                                                            <div class="sheet-switch">
+                                                                <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect12" value="on" title="On" checked="checked">
+                                                                <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect12" value="off" title="Off">
+                                                                <span class="switch-selection"></span>
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                            <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn13" value="13" />
+                                            <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
+                                                <tbody>
+                                                    <tr>
+                                                        <td width="70%"><input type="text" name="attr_critShipName13" readonly="readonly" /></td>
+                                                        <td width="30%"><input type="text" name="attr_critShipRange13" readonly="readonly" /></td>
+                                                        <td class="sheet-crit-dice-bg">
+                                                            <input type="hidden" name="attr_critShipDice13" />
+                                                            <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity13" /><span></span>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary13" readonly="readonly" /></td>
+                                                        <td>
+                                                            <label>Effect:</label>
+                                                            <div class="sheet-switch">
+                                                                <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect13" value="on" title="On" checked="checked">
+                                                                <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect13" value="off" title="Off">
+                                                                <span class="switch-selection"></span>
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                            <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn14" value="14" />
+                                            <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
+                                                <tbody>
+                                                    <tr>
+                                                        <td width="70%"><input type="text" name="attr_critShipName14" readonly="readonly" /></td>
+                                                        <td width="30%"><input type="text" name="attr_critShipRange14" readonly="readonly" /></td>
+                                                        <td class="sheet-crit-dice-bg">
+                                                            <input type="hidden" name="attr_critShipDice14" />
+                                                            <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity14" /><span></span>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary14" readonly="readonly" /></td>
+                                                        <td>
+                                                            <label>Effect:</label>
+                                                            <div class="sheet-switch">
+                                                                <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect14" value="on" title="On" checked="checked">
+                                                                <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect14" value="off" title="Off">
+                                                                <span class="switch-selection"></span>
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                            <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn15" value="15" />
+                                            <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
+                                                <tbody>
+                                                    <tr>
+                                                        <td width="70%"><input type="text" name="attr_critShipName15" readonly="readonly" /></td>
+                                                        <td width="30%"><input type="text" name="attr_critShipRange15" readonly="readonly" /></td>
+                                                        <td class="sheet-crit-dice-bg">
+                                                            <input type="hidden" name="attr_critShipDice15" />
+                                                            <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity15" /><span></span>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary15" readonly="readonly" /></td>
+                                                        <td>
+                                                            <label>Effect:</label>
+                                                            <div class="sheet-switch">
+                                                                <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect15" value="on" title="On" checked="checked">
+                                                                <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect15" value="off" title="Off">
+                                                                <span class="switch-selection"></span>
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                        </div><!-- column -->
+                                        <div class="sheet-small-3 sheet-column">
+                                            <table class="sheet-roll-critical" cellspacing="0" cellpadding="0" border="0">
+                                                <tbody>
+                                                    <tr>
+                                                        <td><label>Critcal roll offset:</label></td>
+                                                        <td><input type="text" name="attr_critShipAddOffset" value="" /></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <label>Critical number:</label>
+                                                            <input type="text" name="attr_critShipAddRangeNum" value="" />
+                                                        </td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                        </div><!-- column -->
+                                        <div class="sheet-clear"></div>
+                                    </div><!-- Vehicle Criticals -->
+                                    <div class="sheet-row">
+                                        <div class="sheet-small-12 sheet-column">
+                                            <h3 class="sheet-section-header">Cargo Hold</h3>
+                                            <table cellspacing="0" cellpadding="0" border="0">
+                                                <tbody><tr><td><textarea name="attr_carho-hold" rows="6"></textarea></td></tr></tbody>
+                                            </table>
+                                        </div>
+                                        <div class="sheet-clear"></div>
+                                    </div><!-- Cargo Hold -->
+                                </div><!-- Depreciated Vehicle Details -->
+                                <div class="sheet-tab-content sheet-tab-v-weapons">
+                                    <br />
+                                    <h3 class="sheet-section-header">Crew Roles</h3>
+                                    <table cellspacing="0" cellpadding="0" border="0">
+                                        <thead>
+                                            <tr>
+                                                <th style="width:180px;">Character Name</th>
+                                                <th style="width:180px;">Role <span style="font-size:10px">(Pilot, Co-pilot, Engineer)</span></th>
+                                                <th><span style="float:left">Dice</span></th>
+                                                <th>Special</th>
+                                                <th colspan="2">Skill</th>
+                                            </tr>
+                                        </thead>
+                                    </table>
+                                    <fieldset class="repeating_shipCrewRoles">
+                                        <table cellspacing="0" cellpadding="0" border="0">
+                                            <tbody>
+                                                <tr>
+                                                    <td style="width:180px;"><input name='attr_shipRoleCharacterName' type="text" /></td>
+                                                    <td style="width:180px;"><input name='attr_shipRoleName' type="text" /></td>
+                                                    <td><input name='attr_shipRoleDice' type="text" /></td>
+                                                    <td><input name='attr_shipRoleSpecial' type="text" /></td>
+                                                    <td>
+                                                        <select name='attr_shipRoleSkill'>
+                                                            <option value="" disabled>Skills</option>
+                                                            <option value="skill:intellect,rankAstrogation">&nbsp;&nbsp;&nbsp;&nbsp;Astrogation</option>
+                                                            <option value="skill:brawn,rankAthletics">&nbsp;&nbsp;&nbsp;&nbsp;Athletics</option>
+                                                            <option value="skill:presence,rankCoercion">&nbsp;&nbsp;&nbsp;&nbsp;Coercion</option>
+                                                            <option value="skill:intellect,rankComputers">&nbsp;&nbsp;&nbsp;&nbsp;Computers</option>
+                                                            <option value="skill:presence,rankCool">&nbsp;&nbsp;&nbsp;&nbsp;Cool</option>
+                                                            <option value="encum|skill:agility,rankCoordination">&nbsp;&nbsp;&nbsp;&nbsp;Coordination</option>
+                                                            <option value="skill:cunning,rankDeception">&nbsp;&nbsp;&nbsp;&nbsp;Deception</option>
+                                                            <option value="skill:willpower,rankDiscipline">&nbsp;&nbsp;&nbsp;&nbsp;Discipline</option>
+                                                            <option value="skill:presence,rankLeadership">&nbsp;&nbsp;&nbsp;&nbsp;Leadership</option>
+                                                            <option value="skill:intellect,rankMechanics">&nbsp;&nbsp;&nbsp;&nbsp;Mechanics</option>
+                                                            <option value="skill:intellect,rankMedicine">&nbsp;&nbsp;&nbsp;&nbsp;Medicine</option>
+                                                            <option value="skill:presence,rankNegotiation">&nbsp;&nbsp;&nbsp;&nbsp;Negotiation</option>
+                                                            <option value="skill:cunning,rankPerception">&nbsp;&nbsp;&nbsp;&nbsp;Perception</option>
+                                                            <option value="encum|skill:agility,rankPlanetary">&nbsp;&nbsp;&nbsp;&nbsp;Piloting - Planetary</option>
+                                                            <option value="encum|skill:agility,rankSpace">&nbsp;&nbsp;&nbsp;&nbsp;Piloting - Space</option>
+                                                            <option value="skill:brawn,rankResilience">&nbsp;&nbsp;&nbsp;&nbsp;Resilience</option>
+                                                            <option value="skill:cunning,rankSkulduggery">&nbsp;&nbsp;&nbsp;&nbsp;Skulduggery</option>
+                                                            <option value="encum|skill:agility,rankStealth">&nbsp;&nbsp;&nbsp;&nbsp;Stealth</option>
+                                                            <option value="skill:cunning,rankStreetwise">&nbsp;&nbsp;&nbsp;&nbsp;Streetwise</option>
+                                                            <option value="skill:cunning,rankSurvival">&nbsp;&nbsp;&nbsp;&nbsp;Survival</option>
+                                                            <option value="skill:willpower,rankVigilance">&nbsp;&nbsp;&nbsp;&nbsp;Vigilance</option>
+                                                            <option value="" disabled>Combat Skills</option>
+                                                            <option value="skill:brawn,rankBrawl">&nbsp;&nbsp;&nbsp;&nbsp;Brawl</option>
+                                                            <option value="encum|skill:agility,rankGunnery">&nbsp;&nbsp;&nbsp;&nbsp;Gunnery</option>
+                                                            <option value="skill:brawn,rankMelee">&nbsp;&nbsp;&nbsp;&nbsp;Melee</option>
+                                                            <option value="encum|skill:agility,rankLight">&nbsp;&nbsp;&nbsp;&nbsp;Ranged - Light</option>
+                                                            <option value="encum|skill:agility,rankHeavy">&nbsp;&nbsp;&nbsp;&nbsp;Ranged - Heavy</option>
+                                                            <option value="" disabled>Knowledge Skills</option>
+                                                            <option value="skill:intellect,rankCore">&nbsp;&nbsp;&nbsp;&nbsp;Core Worlds</option>
+                                                            <option value="skill:intellect,rankEducation">&nbsp;&nbsp;&nbsp;&nbsp;Education</option>
+                                                            <option value="skill:intellect,rankLore">&nbsp;&nbsp;&nbsp;&nbsp;Lore</option>
+                                                            <option value="skill:intellect,rankOuter">&nbsp;&nbsp;&nbsp;&nbsp;Outer Rim</option>
+                                                            <option value="skill:intellect,rankUnderworld">&nbsp;&nbsp;&nbsp;&nbsp;Underworld</option>
+                                                            <option value="skill:intellect,rankXenology">&nbsp;&nbsp;&nbsp;&nbsp;Xenology</option>
+                                                            <option value="skill:intellect,rankWarfare">&nbsp;&nbsp;&nbsp;&nbsp;Warfare</option>
+                                                        </select>
+                                                    </td>
+                                                </tr>
+                                            </tbody>
+                                        </table>
+                                    </fieldset>
+                                    <br />
+                                    <h3 class="sheet-section-header">Weapons</h3>
+                                    <fieldset class="repeating_shipWeapons">
+                                        <table cellspacing="0" cellpadding="0" border="0">
+                                            <thead>
+                                                <tr>
+                                                    <th>Character Name</th>
+                                                    <th>Weapon Name</th>
+                                                    <th>Arc</th>
+                                                    <th>Crit</th>
+                                                    <th>Dmg</th>
+                                                    <th colspan="2">Range/Skill</th>
+                                                </tr>
+                                            </thead>
+                                            <tbody>
+                                                <tr>
+                                                    <td><input name='attr_shipWeaponCharacterName' type="text" /></td>
+                                                    <td><input name='attr_shipWeaponName' type="text" /></td>
+                                                    <td class="sheet-firearc-field">
+                                                        <input name='attr_fireArcFore' type="checkbox" class="sheet-fireArcFore" Title="Fore" />
+                                                        <input name='attr_fireArcStarboard' type="checkbox" class="sheet-fireArcStarboard" Title="Starboard" />
+                                                        <input name='attr_fireArcAft' type="checkbox" class="sheet-fireArcAft" Title="Aft" />
+                                                        <input name='attr_fireArcPort' type="checkbox" class="sheet-fireArcPort" Title="Port" />
+                                                        <span class="sheet-fireArcForeImg"></span>
+                                                        <span class="sheet-fireArcStarboardImg"></span>
+                                                        <span class="sheet-fireArcAftImg"></span>
+                                                        <span class="sheet-fireArcPortImg"></span>
+                                                    </td>
+                                                    <td style="width:50px"><input name='attr_shipWeaponCrit' type="number" max="99" min="-99" value="0" /></td>
+                                                    <td style="width:50px"><input name='attr_shipWeaponDmg' type="number" max="99" min="-99" value="0" /></td>
+                                                    <td style="width:150px">
+                                                        <select name='attr_shipWeaponRange'>
+                                                            <option value="Close">Close</option>
+                                                            <option value="Short">Short</option>
+                                                            <option value="Medium">Medium</option>
+                                                            <option value="Long">Long</option>
+                                                            <option value="Extreme">Extreme</option>
+                                                        </select>
+                                                    </td>
+                                                    <td>&nbsp;</td>
+                                                </tr>
+                                                <tr>
+                                                    <td><label style="display:inline-block; width:25%;">Dice:</label><input style="display:inline-block; width:74%;" name='attr_shipWeaponDice' type="text" /></td>
+                                                    <td colspan="4"><label style="display:inline-block; width:25%;">Special:</label><input style="display:inline-block; width:74%;" name='attr_shipWeaponSpecial' type="text" /></td>
+                                                    <td>
+                                                        <select name='attr_shipWeaponSkill'>
+                                                            <option value="skill:agility,rankGunnery">Gunnery</option>
+                                                            <option value="skill:agility,rankHeavy">Ranged - Heavy</option>
+                                                        </select>
+                                                    </td>
+                                                </tr>
+                                            </tbody>
+                                        </table>
+                                    </fieldset>
+                                </div><!-- Depreciated Vehicle Weapons -->
+                                <label>End of Old Vehicle Tabs</label>
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+    </div><!--Old Vehicle Tabs-->
 
     <div class="sheet-tab-content sheet-tab-transport-space">
         <div class="sheet-row">
@@ -4576,15 +5277,15 @@ Version 4.0.4.2
                         </td>
                         <td class="sheet-ship-char-thre-bg">
                             <label class="sheet-label-title">Hull Trauma</label>
-                            <input name="attr_space-hull_trauma_max" type="number" max="99" min="0" value="0" />
-                            <input name="attr_space-hull_trauma" type="number" max="99" min="0" value="0" /><br />
+                            <input name="attr_space-hull_trauma_max" type="number" min="0" value="0" />
+                            <input name="attr_space-hull_trauma" type="number" min="0" value="0" /><br />
                             <label class="sheet-label-threshold">Threshold</label>
                             <label class="sheet-label-current">Current</label>
                         </td>
                         <td class="sheet-ship-char-thre-bg">
                             <label class="sheet-label-title">Sys Strain</label>
-                            <input name="attr_space-system_strain_max" type="number" max="99" min="0" value="0" />
-                            <input name="attr_space-system_strain" type="number" max="99" min="0" value="0" /><br />
+                            <input name="attr_space-system_strain_max" type="number" min="0" value="0" />
+                            <input name="attr_space-system_strain" type="number" min="0" value="0" /><br />
                             <label class="sheet-label-threshold">Threshold</label>
                             <label class="sheet-label-current">Current</label>
                         </td>
@@ -5445,15 +6146,15 @@ Version 4.0.4.2
                         </td>
                         <td class="sheet-ship-char-thre-bg">
                             <label class="sheet-label-title">Hull Trauma</label>
-                            <input name="attr_planetary-hull_trauma_max" type="number" max="99" min="0" value="0" />
-                            <input name="attr_planetary-hull_trauma" type="number" max="99" min="0" value="0" /><br />
+                            <input name="attr_planetary-hull_trauma_max" type="number" min="0" value="0" />
+                            <input name="attr_planetary-hull_trauma" type="number" min="0" value="0" /><br />
                             <label class="sheet-label-threshold">Threshold</label>
                             <label class="sheet-label-current">Current</label>
                         </td>
                         <td class="sheet-ship-char-thre-bg">
                             <label class="sheet-label-title">Sys Strain</label>
-                            <input name="attr_planetary-system_strain_max" type="number" max="99" min="0" value="0" />
-                            <input name="attr_planetary-system_strain" type="number" max="99" min="0" value="0" /><br />
+                            <input name="attr_planetary-system_strain_max" type="number" min="0" value="0" />
+                            <input name="attr_planetary-system_strain" type="number" min="0" value="0" /><br />
                             <label class="sheet-label-threshold">Threshold</label>
                             <label class="sheet-label-current">Current</label>
                         </td>
@@ -6257,15 +6958,15 @@ Version 4.0.4.2
                         <tr>
                             <td>
                                 <label class="sheet-label-title">Wounds</label>
-                                <input name="attr_transport-beast-wounds_max" type="number" max="99" min="1" value="1" />
-                                <input name="attr_transport-beast-wounds" type="number" max="99" min="0" value="0" /><br />
+                                <input name="attr_transport-beast-wounds_max" type="number" min="1" value="1" />
+                                <input name="attr_transport-beast-wounds" type="number" min="0" value="0" /><br />
                                 <label class="sheet-label-threshold">Threshold</label>
                                 <label class="sheet-label-current">Current</label>
                             </td>
                             <td>
                                 <label class="sheet-label-title">Strain</label>
-                                <input name="attr_transport-beast-strain_max" type="number" max="99" min="1" value="1" />
-                                <input name="attr_transport-beast-strain" type="number" max="99" min="0" value="0" /><br />
+                                <input name="attr_transport-beast-strain_max" type="number" min="1" value="1" />
+                                <input name="attr_transport-beast-strain" type="number" min="0" value="0" /><br />
                                 <label class="sheet-label-threshold">Threshold</label>
                                 <label class="sheet-label-current">Current</label>
                             </td>
@@ -6278,7 +6979,7 @@ Version 4.0.4.2
                             </td>
                             <td rowspan="2">
                                 <label class="sheet-label-title">Encum</label>
-                                <input name="attr_transport-beast-encumbrance_max" type="number" max="99" min="1" value="1" />
+                                <input name="attr_transport-beast-encumbrance_max" type="number" min="1" value="1" />
                                 <input name="attr_transport-beast-encumbrancemax" type="hidden" value="@{transport-beast-encumbrance|max}" disabled />
                                 <input name="attr_transport-beast-encumbrance" type="number" max="99" min="0" value="0" /><br />
                                 <label class="sheet-label-threshold">Threshold</label>
@@ -7382,7 +8083,7 @@ Version 4.0.4.2
                                 <td><label>Name:</label></td>
                                 <td><input name="attr_business-NPC-name1" type="text" /></td>
                                 <td><label>Description:</label></td>
-                                <td><textarea rows="2" type="text" name="attr_rebelbase-npcdescription1"></textarea></td>
+                                <td><textarea rows="2" type="text" name="attr_business-npcdescription1"></textarea></td>
                             </tr>
                         </tbody>
                         <tbody>
@@ -7399,7 +8100,7 @@ Version 4.0.4.2
                                     <td><label>Name:</label></td>
                                     <td><input name="attr_business-NPC-name2" type="text" /></td>
                                     <td><label>Description:</label></td>
-                                    <td><textarea rows="2" type="text" name="attr_rebelbase-npcdescription2"></textarea></td>
+                                    <td><textarea rows="2" type="text" name="attr_business-npcdescription2"></textarea></td>
                                 </tr>
                             </tbody>
                             <tbody>
@@ -7486,7 +8187,7 @@ Version 4.0.4.2
                                 <td><label>Name:</label></td>
                                 <td><input name="attr_homestead-NPC-name1" type="text" /></td>
                                 <td><label>Description:</label></td>
-                                <td><textarea rows="2" type="text" name="attr_rebelbase-npcdescription1"></textarea></td>
+                                <td><textarea rows="2" type="text" name="attr_homestead-npcdescription1"></textarea></td>
                             </tr>
                         </tbody>
                         <tbody>
@@ -7503,7 +8204,7 @@ Version 4.0.4.2
                                     <td><label>Name:</label></td>
                                     <td><input name="attr_homestead-NPC-name2" type="text" /></td>
                                     <td><label>Description:</label></td>
-                                    <td><textarea rows="2" type="text" name="attr_rebelbase-npcdescription2"></textarea></td>
+                                    <td><textarea rows="2" type="text" name="attr_homestead-npcdescription2"></textarea></td>
                                 </tr>
                             </tbody>
                             <tbody>
@@ -7622,7 +8323,7 @@ Version 4.0.4.2
         <div class="sheet-row">
             <div class="sheet-small-12 sheet-column">
                 <h3 class="sheet-section-header">Group Tasks</h3>
-                <fieldset class="repeating_obligation">
+                <fieldset class="repeating_group-tasks">
                     <table cellspacing="0" cellpadding="0" border="0">
                         <tbody>
                             <tr>
@@ -7651,7 +8352,7 @@ Version 4.0.4.2
         <div class="sheet-row">
             <div class="sheet-small-12 sheet-column">
                 <h3 class="sheet-section-header">Group Obligations</h3>
-                <fieldset class="repeating_obligation">
+                <fieldset class="repeating_group-obligation">
                     <table cellspacing="0" cellpadding="0" border="0">
                         <tbody>
                             <tr>
@@ -7864,7 +8565,7 @@ Version 4.0.4.2
                                     <option value="Verpine">Verpine</option>
                                     <option value="Weequay">Weequay</option>
                                     <option value="Whiphid">Whiphid</option>
-                                    <option value="Wookie">Wookie</option>
+                                    <option value="Wookiee">Wookiee</option>
                                     <option value="Xexto">Xexto</option>
                                     <option value="Zabrak">Zabrak</option>
                                 </select><!--Species List-->
@@ -9394,690 +10095,6 @@ Version 4.0.4.2
         </div>
     </div><!-- Inventory Tab -->
 </div><!-- Player Companion sheet -->
-<div class="sheet-tab-content sheet-tab-older">
-    <div class="sheet-row">
-        <div class="sheet-small-12 sheet-column">
-            <table class="sheet-ship" cellspacing="0" cellpadding="0" border="0">
-                <tr>
-                    <td class="sheet-ship-char-bg">
-                        <label>Silhouette</label>
-                        <input name='attr_silhouette' type="number" max="99" min="0" value="0" />
-                    </td>
-                    <td class="sheet-ship-char-thre-bg-speed">
-                        <label class="sheet-label-title">Speed</label>
-                        <input name="attr_speed" type="number" max="99" min="-99" value="0" />
-                        <input name="attr_speed_current" type="number" max="99" min="-99" value="0" /><br />
-                        <label class="sheet-label-threshold-speed">Max</label>
-                        <label class="sheet-label-current-speed">Current</label>
-                    </td>
-                    <td class="sheet-ship-char-bg">
-                        <label>Handling</label>
-                        <input name='attr_handling' type="number" max="99" min="0" value="0" />
-                    </td>
-                    <td rowspan="2" class="sheet-ship-defense">
-                        <div style="width:302px; height:1px;"></div>
-                        <label class="sheet-def-label">Defense</label>
-                        <div class="sheet-fore">
-                            <label>Fore</label>
-                            <input name='attr_deffore' type="number" max="99" min="0" value="0" />
-                        </div>
-                        <div class="sheet-starboard">
-                            <label>Starboard</label>
-                            <input name='attr_defstarboard' type="number" max="99" min="0" value="0" />
-                        </div>
-                        <div class="sheet-aft">
-                            <label>Aft</label>
-                            <input name='attr_defaft' type="number" max="99" min="0" value="0" />
-                        </div>
-                        <div class="sheet-port">
-                            <label>Port</label>
-                            <input name='attr_defport' type="number" max="99" min="0" value="0" />
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="sheet-ship-char-thre-bg">
-                        <label class="sheet-label-title">Armor</label>
-                        <input name="attr_ship_armor" type="number" max="99" min="-99" value="0">
-                    </td>
-                    <td class="sheet-ship-char-thre-bg">
-                        <label class="sheet-label-title">Hull Trauma</label>
-                        <input name="attr_hull_trauma_max" type="number" max="99" min="-99" value="0" />
-                        <input name="attr_hull_trauma" type="number" max="99" min="-99" value="0" /><br />
-                        <label class="sheet-label-threshold">Threshold</label>
-                        <label class="sheet-label-current">Current</label>
-                    </td>
-                    <td class="sheet-ship-char-thre-bg">
-                        <label class="sheet-label-title">Sys Strain</label>
-                        <input name="attr_system_strain_max" type="number" max="99" min="-99" value="0" />
-                        <input name="attr_system_strain" type="number" max="99" min="-99" value="0" /><br />
-                        <label class="sheet-label-threshold">Threshold</label>
-                        <label class="sheet-label-current">Current</label>
-                    </td>
-                </tr>
-            </table>
-        </div><!-- end column -->
-        <div class="sheet-clear"></div>
-    </div><!-- Depreciated Vehicle Top Stats -->
-
-    <input type="radio" name="attr_old-sheet" class="sheet-tab-new sheet-tab-v-details" value="1" checked="checked" />
-    <span class="sheet-tab-new">&emsp;Details&emsp;</span>
-    <input type="radio" name="attr_old-sheet" class="sheet-tab-new sheet-tab-v-weapons" value="2" />
-    <span class="sheet-tab-new">&emsp;Weapons&emsp;</span>
-
-    <div class="sheet-tab-content sheet-tab-v-details">
-        <div class="sheet-row">
-            <div class="sheet-small-12 sheet-column">
-                <br />
-                <input type="radio" name="attr_opt-vehicle-ship" class="sheet-opt sheet-opt-vehicle" value="1" title="Vehicle" checked="checked" />
-                <input type="radio" name="attr_opt-vehicle-ship" class="sheet-opt sheet-opt-ship" value="2" title="Ship" />
-                <br /><br />
-                <h3 class="sheet-section-header">Details</h3>
-                <table cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td><label>Name:</label></td>
-                            <td><input name="attr_v-s-name" type="text" /></td>
-                            <td><label>Hard Points:</label></td>
-                            <td><input name="attr_hard-points" type="text" /></td>
-                        </tr>
-                        <tr>
-                            <td class="sheet-opt-content sheet-opt-vehicle"><label>Vehicle Type/Model:</label></td>
-                            <td class="sheet-opt-content sheet-opt-vehicle"><input name="attr_vehicle-type-model" type="text" /></td>
-                            <td class="sheet-opt-content sheet-opt-ship"><label>Hull Type/Class:</label></td>
-                            <td class="sheet-opt-content sheet-opt-ship"><input name="attr_hull-type-class" type="text" /></td>
-                            <td><label>Sensor Range:</label></td>
-                            <td>
-                                <select name="attr_sensor-range">
-                                    <option value="none">None</option>
-                                    <option value="Close">Close</option>
-                                    <option value="Short">Short</option>
-                                    <option value="Medium">Medium</option>
-                                    <option value="Long">Long</option>
-                                    <option value="Extreme">Extreme</option>
-                                </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><label>Manufacturer:</label></td>
-                            <td><input name="attr_manufacturer" type="text" /></td>
-                            <td><label>Encumbrance Capacity:</label></td>
-                            <td><input name="attr_encum-capacity" type="text" />>
-                        </tr>
-                        <tr>
-                            <td><label>Passenger Capacity:</label></td>
-                            <td><input name="attr_pass-capacity" type="text" /></td>
-                            <td class="sheet-opt-content sheet-opt-vehicle"><label>Maximum Altitude:</label></td>
-                            <td class="sheet-opt-content sheet-opt-vehicle"><input name="attr_vehicle-max-altiude" type="text" /></td>
-                            <td class="sheet-opt-content sheet-opt-ship"><label>Navicomputer: </label></td>
-                            <td class="sheet-opt-content sheet-opt-ship"><input name="attr_ship-navicomputer" type="checkbox" value="1" /></td>
-                        </tr>
-                        <tr>
-                            <td class="sheet-opt-content sheet-opt-vehicle"><label>Crew:</label></td>
-                            <td class="sheet-opt-content sheet-opt-vehicle"><input name="attr_vehicle-crew" type="text" /></td>
-                            <td class="sheet-opt-content sheet-opt-vehicle" colspan="2">&nbsp;</td>
-                            <td class="sheet-opt-content sheet-opt-ship"><label>Ship's Complement:</label></td>
-                            <td class="sheet-opt-content sheet-opt-ship"><input name="attr_ships-complement" type="text" /></td>
-                            <td class="sheet-opt-content sheet-opt-ship"><label>Hyperdrive Primary Class:</label></td>
-                            <td class="sheet-opt-content sheet-opt-ship"><input name="attr_hyperdrive-primary" type="text" /></td>
-                        </tr>
-                        <tr class="sheet-opt-content sheet-opt-ship">
-                            <td><label>Consumables:</label></td>
-                            <td><input name="attr_ship-consumables" type="text" /></td>
-                            <td><label>Hyperdrive Backup Class:</label></td>
-                            <td><input name="attr_hyperdrive-backup" type="text" /></td>
-                        </tr>
-                    </tbody>
-                </table>
-                <br />
-            </div><!-- end column -->
-            <div class="sheet-clear"></div>
-        </div><!-- Vehicle General Info -->
-        <div class="sheet-row">
-            <div class="sheet-small-12 sheet-column">
-                <h3 class="sheet-section-header">Attachments</h3>
-                <table cellspacing="0" cellpadding="0" border="0">
-                    <thead>
-                        <tr>
-                            <th style="width:25%">Name</th>
-                            <th style="width:25%">Hard points</th>
-                            <th style="width:25%">Base Modifiers</th>
-                            <th style="width:25%">Modifications</th>
-                        </tr>
-                    </thead>
-                </table>
-                <fieldset class="repeating_shipAttachments">
-                    <table cellspacing="0" cellpadding="0" border="0">
-                        <tbody>
-                            <tr>
-                                <td style="width:25%"><input name='attr_shipAttachName' type="text" /></td>
-                                <td style="width:25%"><input name='attr_shipAttachHP' type="text" /></td>
-                                <td style="width:25%"><input name='attr_shipAttachBaseMod' type="text" /></td>
-                                <td style="width:25%"><input name='attr_shipAttachMod' type="text" /></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </fieldset>
-            </div>
-            <div class="sheet-clear"></div>
-        </div><!-- Vehicle Attachments -->
-        <div class="sheet-row sheet-show-critical-table">
-            <div class="sheet-small-12 sheet-column">
-                <h3 class="sheet-section-header">Vehicle Critical</h3>
-            </div><!-- column -->
-            <div class="sheet-small-9 sheet-column">
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn1" value="1" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName1" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange1" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice1" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity1" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea row="3" name="attr_critShipSummary1" readonly="readonly"></textarea></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect1" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect1" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn2" value="2" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName2" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange2" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice2" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity2" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary2" readonly="readonly" /></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect2" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect2" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr></tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn3" value="3" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName3" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange3" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice3" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity3" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary3" readonly="readonly" /></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect3" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect3" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn4" value="4" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName4" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange4" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice4" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity4" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary4" readonly="readonly" /></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect4" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect4" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn5" value="5" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName5" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange5" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice5" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity5" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary5" readonly="readonly" /></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect5" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect5" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn6" value="6" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName6" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange6" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice6" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity6" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary6" readonly="readonly" /></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect6" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect6" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn7" value="7" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName7" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange7" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice7" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity7" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary7" readonly="readonly" /></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect7" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect7" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn8" value="8" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName8" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange8" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice8" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity8" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary8" readonly="readonly" /></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect8" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect8" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn9" value="9" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName9" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange9" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice9" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity9" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary9" readonly="readonly" /></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect9" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect9" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn10" value="10" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName10" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange10" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice10" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity10" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary10" readonly="readonly" /></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect10" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect10" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn11" value="11" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName11" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange11" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice11" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity11" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary11" readonly="readonly" /></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect11" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect11" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn12" value="12" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName12" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange12" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice12" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity12" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary12" readonly="readonly" /></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect12" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect12" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn13" value="13" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName13" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange13" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice13" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity13" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary13" readonly="readonly" /></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect13" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect13" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn14" value="14" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName14" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange14" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice14" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity14" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary14" readonly="readonly" /></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect14" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect14" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-                <input type="checkbox" class="sheet-checkbox-criton" name="attr_critShipOn15" value="15" />
-                <table class="sheet-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td width="70%"><input type="text" name="attr_critShipName15" readonly="readonly" /></td>
-                            <td width="30%"><input type="text" name="attr_critShipRange15" readonly="readonly" /></td>
-                            <td class="sheet-crit-dice-bg">
-                                <input type="hidden" name="attr_critShipDice15" />
-                                <input class="sheet-pd" value="4" type="hidden" name="attr_critShipSeverity15" /><span></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2" rowspan="2"><textarea rows="3" type="text" name="attr_critShipSummary15" readonly="readonly" /></td>
-                            <td>
-                                <label>Effect:</label>
-                                <div class="sheet-switch">
-                                    <input type="radio" class="sheet-switch-input-on" name="attr_critShipEffect15" value="on" title="On" checked="checked">
-                                    <input type="radio" class="sheet-switch-input-off" name="attr_critShipEffect15" value="off" title="Off">
-                                    <span class="switch-selection"></span>
-                                </div>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div><!-- column -->
-            <div class="sheet-small-3 sheet-column">
-                <table class="sheet-roll-critical" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                        <tr>
-                            <td><label>Critcal roll offset:</label></td>
-                            <td><input type="text" name="attr_critShipAddOffset" value="" /></td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <label>Critical number:</label>
-                                <input type="text" name="attr_critShipAddRangeNum" value="" />
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div><!-- column -->
-            <div class="sheet-clear"></div>
-        </div><!-- Vehicle Criticals -->
-        <div class="sheet-row">
-            <div class="sheet-small-12 sheet-column">
-                <h3 class="sheet-section-header">Cargo Hold</h3>
-                <table cellspacing="0" cellpadding="0" border="0">
-                    <tbody><tr><td><textarea name="attr_carho-hold" rows="6"></textarea></td></tr></tbody>
-                </table>
-            </div>
-            <div class="sheet-clear"></div>
-        </div><!-- Cargo Hold -->
-    </div><!-- Depreciated Vehicle Details -->
-    <div class="sheet-tab-content sheet-tab-v-weapons">
-        <br />
-        <h3 class="sheet-section-header">Crew Roles</h3>
-        <table cellspacing="0" cellpadding="0" border="0">
-            <thead>
-                <tr>
-                    <th style="width:180px;">Character Name</th>
-                    <th style="width:180px;">Role <span style="font-size:10px">(Pilot, Co-pilot, Engineer)</span></th>
-                    <th><span style="float:left">Dice</span></th>
-                    <th>Special</th>
-                    <th colspan="2">Skill</th>
-                </tr>
-            </thead>
-        </table>
-        <fieldset class="repeating_shipCrewRoles">
-            <table cellspacing="0" cellpadding="0" border="0">
-                <tbody>
-                    <tr>
-                        <td style="width:180px;"><input name='attr_shipRoleCharacterName' type="text" /></td>
-                        <td style="width:180px;"><input name='attr_shipRoleName' type="text" /></td>
-                        <td><input name='attr_shipRoleDice' type="text" /></td>
-                        <td><input name='attr_shipRoleSpecial' type="text" /></td>
-                        <td>
-                            <select name='attr_shipRoleSkill'>
-                                <option value="" disabled>Skills</option>
-                                <option value="skill:intellect,rankAstrogation">&nbsp;&nbsp;&nbsp;&nbsp;Astrogation</option>
-                                <option value="skill:brawn,rankAthletics">&nbsp;&nbsp;&nbsp;&nbsp;Athletics</option>
-                                <option value="skill:presence,rankCoercion">&nbsp;&nbsp;&nbsp;&nbsp;Coercion</option>
-                                <option value="skill:intellect,rankComputers">&nbsp;&nbsp;&nbsp;&nbsp;Computers</option>
-                                <option value="skill:presence,rankCool">&nbsp;&nbsp;&nbsp;&nbsp;Cool</option>
-                                <option value="encum|skill:agility,rankCoordination">&nbsp;&nbsp;&nbsp;&nbsp;Coordination</option>
-                                <option value="skill:cunning,rankDeception">&nbsp;&nbsp;&nbsp;&nbsp;Deception</option>
-                                <option value="skill:willpower,rankDiscipline">&nbsp;&nbsp;&nbsp;&nbsp;Discipline</option>
-                                <option value="skill:presence,rankLeadership">&nbsp;&nbsp;&nbsp;&nbsp;Leadership</option>
-                                <option value="skill:intellect,rankMechanics">&nbsp;&nbsp;&nbsp;&nbsp;Mechanics</option>
-                                <option value="skill:intellect,rankMedicine">&nbsp;&nbsp;&nbsp;&nbsp;Medicine</option>
-                                <option value="skill:presence,rankNegotiation">&nbsp;&nbsp;&nbsp;&nbsp;Negotiation</option>
-                                <option value="skill:cunning,rankPerception">&nbsp;&nbsp;&nbsp;&nbsp;Perception</option>
-                                <option value="encum|skill:agility,rankPlanetary">&nbsp;&nbsp;&nbsp;&nbsp;Piloting - Planetary</option>
-                                <option value="encum|skill:agility,rankSpace">&nbsp;&nbsp;&nbsp;&nbsp;Piloting - Space</option>
-                                <option value="skill:brawn,rankResilience">&nbsp;&nbsp;&nbsp;&nbsp;Resilience</option>
-                                <option value="skill:cunning,rankSkulduggery">&nbsp;&nbsp;&nbsp;&nbsp;Skulduggery</option>
-                                <option value="encum|skill:agility,rankStealth">&nbsp;&nbsp;&nbsp;&nbsp;Stealth</option>
-                                <option value="skill:cunning,rankStreetwise">&nbsp;&nbsp;&nbsp;&nbsp;Streetwise</option>
-                                <option value="skill:cunning,rankSurvival">&nbsp;&nbsp;&nbsp;&nbsp;Survival</option>
-                                <option value="skill:willpower,rankVigilance">&nbsp;&nbsp;&nbsp;&nbsp;Vigilance</option>
-                                <option value="" disabled>Combat Skills</option>
-                                <option value="skill:brawn,rankBrawl">&nbsp;&nbsp;&nbsp;&nbsp;Brawl</option>
-                                <option value="encum|skill:agility,rankGunnery">&nbsp;&nbsp;&nbsp;&nbsp;Gunnery</option>
-                                <option value="skill:brawn,rankMelee">&nbsp;&nbsp;&nbsp;&nbsp;Melee</option>
-                                <option value="encum|skill:agility,rankLight">&nbsp;&nbsp;&nbsp;&nbsp;Ranged - Light</option>
-                                <option value="encum|skill:agility,rankHeavy">&nbsp;&nbsp;&nbsp;&nbsp;Ranged - Heavy</option>
-                                <option value="" disabled>Knowledge Skills</option>
-                                <option value="skill:intellect,rankCore">&nbsp;&nbsp;&nbsp;&nbsp;Core Worlds</option>
-                                <option value="skill:intellect,rankEducation">&nbsp;&nbsp;&nbsp;&nbsp;Education</option>
-                                <option value="skill:intellect,rankLore">&nbsp;&nbsp;&nbsp;&nbsp;Lore</option>
-                                <option value="skill:intellect,rankOuter">&nbsp;&nbsp;&nbsp;&nbsp;Outer Rim</option>
-                                <option value="skill:intellect,rankUnderworld">&nbsp;&nbsp;&nbsp;&nbsp;Underworld</option>
-                                <option value="skill:intellect,rankXenology">&nbsp;&nbsp;&nbsp;&nbsp;Xenology</option>
-                                <option value="skill:intellect,rankWarfare">&nbsp;&nbsp;&nbsp;&nbsp;Warfare</option>
-                            </select>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-        </fieldset>
-        <br />
-        <h3 class="sheet-section-header">Weapons</h3>
-        <fieldset class="repeating_shipWeapons">
-            <table cellspacing="0" cellpadding="0" border="0">
-                <thead>
-                    <tr>
-                        <th>Character Name</th>
-                        <th>Weapon Name</th>
-                        <th>Arc</th>
-                        <th>Crit</th>
-                        <th>Dmg</th>
-                        <th colspan="2">Range/Skill</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr>
-                        <td><input name='attr_shipWeaponCharacterName' type="text" /></td>
-                        <td><input name='attr_shipWeaponName' type="text" /></td>
-                        <td class="sheet-firearc-field">
-                            <input name='attr_fireArcFore' type="checkbox" class="sheet-fireArcFore" Title="Fore" />
-                            <input name='attr_fireArcStarboard' type="checkbox" class="sheet-fireArcStarboard" Title="Starboard" />
-                            <input name='attr_fireArcAft' type="checkbox" class="sheet-fireArcAft" Title="Aft" />
-                            <input name='attr_fireArcPort' type="checkbox" class="sheet-fireArcPort" Title="Port" />
-                            <span class="sheet-fireArcForeImg"></span>
-                            <span class="sheet-fireArcStarboardImg"></span>
-                            <span class="sheet-fireArcAftImg"></span>
-                            <span class="sheet-fireArcPortImg"></span>
-                        </td>
-                        <td style="width:50px"><input name='attr_shipWeaponCrit' type="number" max="99" min="-99" value="0" /></td>
-                        <td style="width:50px"><input name='attr_shipWeaponDmg' type="number" max="99" min="-99" value="0" /></td>
-                        <td style="width:150px">
-                            <select name='attr_shipWeaponRange'>
-                                <option value="Close">Close</option>
-                                <option value="Short">Short</option>
-                                <option value="Medium">Medium</option>
-                                <option value="Long">Long</option>
-                                <option value="Extreme">Extreme</option>
-                            </select>
-                        </td>
-                        <td>&nbsp;</td>
-                    </tr>
-                    <tr>
-                        <td><label style="display:inline-block; width:25%;">Dice:</label><input style="display:inline-block; width:74%;" name='attr_shipWeaponDice' type="text" /></td>
-                        <td colspan="4"><label style="display:inline-block; width:25%;">Special:</label><input style="display:inline-block; width:74%;" name='attr_shipWeaponSpecial' type="text" /></td>
-                        <td>
-                            <select name='attr_shipWeaponSkill'>
-                                <option value="skill:agility,rankGunnery">Gunnery</option>
-                                <option value="skill:agility,rankHeavy">Ranged - Heavy</option>
-                            </select>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-        </fieldset>
-    </div><!-- Depreciated Vehicle Weapons -->
-</div><!--Old Vehicle Settings-->
 
 <!-- Start GM Sheet Tabs - Expanded -->
 <div class="sheet-tab-content sheet-tab-gm-dice">
diff --git a/Star Wars FFG API-Compatible/README.md b/Star Wars FFG API-Compatible/README.md
index 39c6752709..dd7d6b6614 100644
--- a/Star Wars FFG API-Compatible/README.md	
+++ b/Star Wars FFG API-Compatible/README.md	
@@ -6,4 +6,9 @@ Re-Added old Vehicle tabs to allow for smoother transitions.
 Design Change of section headers.
 
 Added Roll Templates
-Fixed display of Species/Career/Specialization to look more crisp.
\ No newline at end of file
+Fixed display of Species/Career/Specialization to look more crisp.
+
+4.0.4.3 Updates;
+Fixed spelling mistakes
+Code cleanup
+Changed display of Old Vehicle Tabs
\ No newline at end of file