diff --git a/Starcraft RPG/starcraft.css b/Starcraft RPG/starcraft.css
index d7734702b3..286202681b 100644
--- a/Starcraft RPG/starcraft.css	
+++ b/Starcraft RPG/starcraft.css	
@@ -7,4 +7,14 @@ hr
     margin: 1em 0;
     padding: 0;
     border-color: black;
-}
\ No newline at end of file
+}
+div.sheet-combat,
+div.sheet-skills,
+div.sheet-powers,
+div.sheet-equipment,
+div.sheet-traits { display: none; }
+input.sheet-tab1:checked ~ div.sheet-combat { display: block; }
+input.sheet-tab2:checked ~ div.sheet-skills { display: block; }
+input.sheet-tab3:checked ~ div.sheet-powers { display: block; }
+input.sheet-tab4:checked ~ div.sheet-equipment { display: block; }
+input.sheet-tab5:checked ~ div.sheet-traits { display: block; }
diff --git a/Starcraft RPG/starcraft.html b/Starcraft RPG/starcraft.html
index 412990bcc6..470b12c6ca 100644
--- a/Starcraft RPG/starcraft.html	
+++ b/Starcraft RPG/starcraft.html	
@@ -65,12 +65,12 @@
 
 		<h2 style="margin-bottom: 10px;">Ability Scores</h2>
 
-		<label>Strength</label><strong class='ability'></strong><button type='roll' name='roll_strength' value='&{template:default} {{name=Strength}} {{Result:=[[1d20+@{Strength}+@{Temp_Strength]]}}'></button><input type="number" name='attr_strength' class='sheet-short'>+<input type="number" name='attr_temp_strength' class='sheet-short'><br />
-		<label>Instinct</label><strong class='ability'></strong><button type='roll' name='roll_instinct' value='&{template:default} {{name=Instinct}} {{Result:=[[1d20+@{Instinct}+@{Temp_Instinct}]]}}'></button><input type="number" name='attr_instinct' class='sheet-short'>+<input type="number" name='attr_temp_instinct' class='sheet-short'><br />
-		<label>Agility</label><strong class='ability'></strong><button type='roll' name='roll_agility' value='&{template:default} {{name=Agility}} {{Result:=[[1d20+@{Agility}+@{Temp_Agility}]]}}'></button><input type="number" name='attr_agility' class='sheet-short'>+<input type="number" name='attr_temp_agility' class='sheet-short'><br />
-		<label>Fortitude</label><strong class='ability'></strong><button type='roll' name='roll_fortitude' value='&{template:default} {{name=Fortitude}} {{Result:=[[1d20+@{Fortitude}+@{Temp_Fortitude}]]}}'></button><input type="number" name='attr_fortitude' class='sheet-short'>+<input type="number" name='attr_temp_fortitude' class='sheet-short'><br />
-		<label>Intelligence</label><strong class='ability'></strong><button type='roll' name='roll_intelligence' value='&{template:default} {{name=Intelligence}} {{Result:=[[1d20+@{Intelligence}+@{Temp_Intelligence}]]}}'></button><input type="number" name='attr_intelligence' class='sheet-short' >+</button><input type="number" name='attr_temp_intelligence' class='sheet-short' ><br />
-		<label>Willpower</label><strong class='ability'></strong><button type='roll' name='roll_willpower' value='&{template:default} {{name=Willpower}} {{Result:=[[1d20+@{Willpower}+@{Temp_Willpower}]]}}'></button><input type="number" name='attr_willpower' class='sheet-short'>+<input type="number" name='attr_temp_willpower' class='sheet-short'><br />
+		<label>Strength</label><strong class='ability'></strong><button type='roll' name='roll_strength' value='&{template:default} {{name=Strength}} {{Result:=[[1d20+@{Strength}+@{Temp_Strength}]]}}'></button><input type="number" name='attr_strength' class='sheet-short'>+<input type="number" name='attr_temp_strength' value='0' class='sheet-short'><br />
+		<label>Instinct</label><strong class='ability'></strong><button type='roll' name='roll_instinct' value='&{template:default} {{name=Instinct}} {{Result:=[[1d20+@{Instinct}+@{Temp_Instinct}]]}}'></button><input type="number" name='attr_instinct' class='sheet-short'>+<input type="number" name='attr_temp_instinct' value='0' class='sheet-short'><br />
+		<label>Agility</label><strong class='ability'></strong><button type='roll' name='roll_agility' value='&{template:default} {{name=Agility}} {{Result:=[[1d20+@{Agility}+@{Temp_Agility}]]}}'></button><input type="number" name='attr_agility' class='sheet-short'>+<input type="number" name='attr_temp_agility' value='0' class='sheet-short'><br />
+		<label>Fortitude</label><strong class='ability'></strong><button type='roll' name='roll_fortitude' value='&{template:default} {{name=Fortitude}} {{Result:=[[1d20+@{Fortitude}+@{Temp_Fortitude}]]}}'></button><input type="number" name='attr_fortitude' class='sheet-short'>+<input type="number" name='attr_temp_fortitude' value='0' class='sheet-short'><br />
+		<label>Intelligence</label><strong class='ability'></strong><button type='roll' name='roll_intelligence' value='&{template:default} {{name=Intelligence}} {{Result:=[[1d20+@{Intelligence}+@{Temp_Intelligence}]]}}'></button><input type="number" name='attr_intelligence' class='sheet-short' >+</button><input type="number" name='attr_temp_intelligence' value='0' class='sheet-short' ><br />
+		<label>Willpower</label><strong class='ability'></strong><button type='roll' name='roll_willpower' value='&{template:default} {{name=Willpower}} {{Result:=[[1d20+@{Willpower}+@{Temp_Willpower}]]}}'></button><input type="number" name='attr_willpower' class='sheet-short'>+<input type="number" name='attr_temp_willpower' value='0' class='sheet-short'><br />
 
 	</div>
 	
@@ -95,7 +95,7 @@
 		<label>Hit Points</label><strong class='stat'></strong><input type="number" name='attr_current_hp' class='sheet-short'>/<input type="number" name='attr_max_hp' class='sheet-short'><br />
 		<label>Shields (Protoss)</label><strong class='stat'></strong><input type="number" name='attr_current_shields' class='sheet-short'>/<input type="number" name='attr_max_shields' class='sheet-short'><br />
 		<label>Damage Threshold</label><strong class='stat'></strong><input type="number" name='attr_dt' class='sheet-short'><br />
-		<label>Healing Threshold</label><strong class='stat'></strong><input type="number" name='attr_ht' class='sheet-short'><br />
+		<label>Healing Threshold</label><strong class='stat'></strong><input type="number" name='attr_ht' class='sheet-short'>/<input type="number" name='attr_max_ht' class='sheet-short'><br />
 		<label>Initiative</label><strong class='stat'></strong><input type="number" name='attr_init' class='sheet-short'><button type='roll' name='roll_initiative' value='&{template:default} {{name=Initiative}} {{Result:=[[1d20+@{Init} &{tracker}]]}}'></button><br />
 		<label>Damage Resistance</label><strong class='stat'></strong><input type="number" name='attr_dr' class='sheet-short'><br />
 		<label>Psionic Resistance</label><strong class='stat'></strong><input type="number" name='attr_pr' class='sheet-short'><br />
@@ -106,6 +106,93 @@
 
 <hr />
 
+<h3 style="margin-bottom: 10px;">Crippling Wound Points</h3>
+
+<div class="sheet-2colrow">
+    
+    <div class="sheet-col">
+        
+        Mobility (1-4):
+        <form action="">
+            
+            <input type="radio" name="mobility" value="0" checked="true">
+            <input type="radio" name="mobility" value="1">
+            <input type="radio" name="mobility" value="2">
+            <input type="radio" name="mobility" value="3">
+            <input type="radio" name="mobility" value="4">
+            <input type="radio" name="mobility" value="5">
+            
+        </form><br />
+        
+        Action (5-8):
+        <form action="">
+            
+            <input type="radio" name="action" value="0" checked="true">
+            <input type="radio" name="action" value="1">
+            <input type="radio" name="action" value="2">
+            <input type="radio" name="action" value="3">
+            <input type="radio" name="action" value="4">
+            <input type="radio" name="action" value="5">
+		
+        </form><br />
+        
+        Core (9-12):
+        <form action="">
+            
+            <input type="radio" name="core" value="0" checked="true">
+            <input type="radio" name="core" value="1">
+            <input type="radio" name="core" value="2">
+            <input type="radio" name="core" value="3">
+            <input type="radio" name="core" value="4">
+            <input type="radio" name="core" value="5">
+		
+        </form>
+        
+    </div>
+    
+    <div class="sheet-col">
+        
+        Vital (13-16):
+        <form action="">
+            
+            <input type="radio" name="vital" value="0" checked="true">
+            <input type="radio" name="vital" value="1">
+            <input type="radio" name="vital" value="2">
+            <input type="radio" name="vital" value="3">
+            <input type="radio" name="vital" value="4">
+            <input type="radio" name="vital" value="5">	
+            
+        </form><br />
+        
+        Critical (17-20):
+        <form action="">
+            
+            <input type="radio" name="critical" value="0" checked="true">
+            <input type="radio" name="critical" value="1">
+            <input type="radio" name="critical" value="2">
+            <input type="radio" name="critical" value="3">
+            <input type="radio" name="critical" value="4">
+            <input type="radio" name="critical" value="5">
+		
+        </form><br />
+        
+    </div>
+    
+</div>
+
+<hr />
+
+<h3 style="margin-bottom: 10px;">Tabs</h3>
+<input type="radio" name="attr_tab" class="sheet-tab1" value="1" checked="checked">Combat Stats<br/>
+<input type="radio" name="attr_tab" class="sheet-tab2" value="2">Skills<br/>
+<input type="radio" name="attr_tab" class="sheet-tab3" value="3">Powers<br/>
+<input type="radio" name="attr_tab" class="sheet-tab4" value="4">Equipment<br/>
+<input type="radio" name="attr_tab" class="sheet-tab5" value="5">Character Traits
+
+<hr />
+
+<div class="sheet-combat">
+
 <h2 style="margin-bottom: 10px;">Weapons</h2>
 
 <div class="sheet-6colrow">
@@ -113,7 +200,7 @@
     <div class="sheet-col">
         
         <h3 style="margin-bottom: 10px;">Weapon</h3>
-        <button type='roll' name='roll_attack' value='&{template:default} {{name=@{Weapon}}} {{Attack:=[[1d20+@{Accuracy}+@{Temp_Acc}+[[(@{Strikes}-1)*4]]]]}} {{Base Damage:=@{Damage}+@{Temp_Dmg}}} {{Traits:=@{Traits}}}'></button>
+        <button type='roll' name='roll_attack' value='&{template:default} {{name=@{Weapon}}} {{Attack:=[[1d20+@{Accuracy}+@{Temp_Acc}+[[(@{Strikes}-1)*4]]]]}} {{Base Damage:=[[@{Damage}+@{Temp_Dmg}]]}} {{Traits:=@{Traits}}}'></button>
         <input type="text" name="attr_weapon" />
         
     </div>
@@ -121,14 +208,14 @@
     <div class="sheet-col">
         
         <h3 style="margin-bottom: 10px;">Acc.</h3>
-        <input type="number" name="attr_accuracy" />+<input type="number" name="attr_temp_acc" />
+        <input type="number" name="attr_accuracy" />+<input type="number" name="attr_temp_acc" value='0' />
         
     </div>
     
     <div class="sheet-col">
         
         <h3 style="margin-bottom: 10px;">Dmg.</h3>
-        <input type="number" name="attr_damage" />+<input type="number" name="attr_temp_dmg" />
+        <input type="number" name="attr_damage" />+<input type="number" name="attr_temp_dmg" value='0' />
         
     </div>
     
@@ -167,7 +254,7 @@
         <div class="sheet-col">
             
             <h3 style="margin-bottom: 10px;">Weapon</h3>
-            <button type='roll' name='roll_attack' value='&{template:default} {{name=@{Weapon}}} {{Attack:=[[1d20+@{Accuracy}+@{Temp_Acc}+[[(@{Strikes}-1)*4]]]]}} {{Base Damage:=@{Damage}+@{Temp_Dmg}}} {{Traits:=@{Traits}}}'></button>
+            <button type='roll' name='roll_attack' value='&{template:default} {{name=@{Weapon}}} {{Attack:=[[1d20+@{Accuracy}+@{Temp_Acc}+[[(@{Strikes}-1)*4]]]]}} {{Base Damage:=[[@{Damage}+@{Temp_Dmg}]]}} {{Traits:=@{Traits}}}'></button>
             <input type="text" name="attr_weapon" />
             
         </div>
@@ -175,14 +262,14 @@
         <div class="sheet-col">
             
             <h3 style="margin-bottom: 10px;">Acc.</h3>
-            <input type="number" name="attr_accuracy" />+<input type="number" name="attr_temp_acc" />
+            <input type="number" name="attr_accuracy" />+<input type="number" name="attr_temp_acc" value='0' />
             
         </div>
         
         <div class="sheet-col">
             
             <h3 style="margin-bottom: 10px;">Dmg.</h3>
-            <input type="number" name="attr_damage" />+<input type="number" name="attr_temp_dmg" />
+            <input type="number" name="attr_damage" />+<input type="number" name="attr_temp_dmg" value='0' />
             
         </div>
 
@@ -217,76 +304,69 @@
 
 <hr />
 
-<h3 style="margin-bottom: 10px;">Crippling Wound Points</h3>
+<h2 style="margin-bottom: 10px;">Vehicles</h2>
 
 <div class="sheet-2colrow">
     
     <div class="sheet-col">
         
-        Mobility (1-4):
-        <form action="">
-            
-            <input type="radio" name="mobility" value="0" checked="true">
-            <input type="radio" name="mobility" value="1">
-            <input type="radio" name="mobility" value="2">
-            <input type="radio" name="mobility" value="3">
-            <input type="radio" name="mobility" value="4">
-            
-        </form><br />
-        
-        Action (5-8):
-        <form action="">
-            
-            <input type="radio" name="action" value="0" checked="true">
-            <input type="radio" name="action" value="5">
-            <input type="radio" name="action" value="6">
-            <input type="radio" name="action" value="7">
-            <input type="radio" name="action" value="8">
-            
-        </form><br />
-        
-        Core (9-12):
-        <form action="">
-            
-            <input type="radio" name="core" value="0" checked="true">
-            <input type="radio" name="core" value="9">
-            <input type="radio" name="core" value="10">
-            <input type="radio" name="core" value="11">
-            <input type="radio" name="core" value="12">
-            
-        </form>
+        <label>Vehicle:</label><strong class='vehicle'></strong><input type="text" name="attr_vehicle" /><br />
+        <label>Shield Armor (Protoss):</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_shield_armor" /><br />
+        <label>Defense:</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_defense" /><br />
+        <label>Damage Resistance:</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_dr" /><br />
+        <label>Move Speed:</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_speed" /><br />
+        <label>Acceleration Rating:</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_accel" /><br />
         
     </div>
     
     <div class="sheet-col">
         
-        Vital (13-16):
-        <form action="">
-            
-            <input type="radio" name="vital" value="0" checked="true">
-            <input type="radio" name="vital" value="13">
-            <input type="radio" name="vital" value="14">
-            <input type="radio" name="vital" value="15">
-            <input type="radio" name="vital" value="16">
-            
-        </form><br />
-        
-        Critical (17-20):
-        <form action="">
-            
-            <input type="radio" name="critical" value="0" checked="true">
-            <input type="radio" name="critical" value="17">
-            <input type="radio" name="critical" value="18">
-            <input type="radio" name="critical" value="19">
-            <input type="radio" name="critical" value="20">
-            
-        </form><br />
+        <label>Hit Points</label><strong class='vehicle'></strong><input type="number" name='attr_current_vehicle_hp' class='sheet-short'>/<input type="number" name='attr_max_vehicle_hp' class='sheet-short'><br />
+        <label>Shields (Protoss)</label><strong class='vehicle'></strong><input type="number" name='attr_current_vehicle_shields' class='sheet-short'>/<input type="number" name='attr_max_vehicle_shields' class='sheet-short'><br />
+        <label>Toughness:</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_toughness" /><br />
+        <label>Damage Threshold:</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_dt" /><br />
+        <label>Shift Speed:</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_shift" /><br />
+        <label>Max Speed:</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_max" /><br />
         
     </div>
     
 </div>
 
-<hr />
+<fieldset class="repeating_vehicles">
+    
+    <hr />
+    
+    <div class="sheet-2colrow">
+        
+        <div class="sheet-col">
+            
+            <label>Vehicle:</label><strong class='vehicle'></strong><input type="text" name="attr_vehicle" /><br />
+            <label>Shield Armor (Protoss):</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_shield_armor" /><br />
+            <label>Defense:</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_defense" /><br />
+            <label>Damage Resistance:</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_dr" /><br />
+            <label>Move Speed:</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_speed" /><br />
+            <label>Acceleration Rating:</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_accel" /><br />
+            
+        </div>
+        
+        <div class="sheet-col">
+            
+            <label>Hit Points</label><strong class='vehicle'></strong><input type="number" name='attr_current_vehicle_hp' class='sheet-short'>/<input type="number" name='attr_max_vehicle_hp' class='sheet-short'><br />
+            <label>Shields (Protoss)</label><strong class='vehicle'></strong><input type="number" name='attr_current_vehicle_shields' class='sheet-short'>/<input type="number" name='attr_max_vehicle_shields' class='sheet-short'><br />
+            <label>Toughness:</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_toughness" /><br />
+            <label>Damage Threshold:</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_dt" /><br />
+            <label>Shift Speed:</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_shift" /><br />
+            <label>Max Speed:</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_max" /><br />
+            
+        </div>
+        
+    </div>
+    
+</fieldset>
+
+</div>
+
+<div class="sheet-skills">
 
 <div class="sheet-6colrow">
     
@@ -375,26 +455,26 @@
         
         <h3 style="margin-bottom: 10px;">Bonus</h3>
         
-        <input type="number" name='attr_bonus_acrobatics' value="0" class='sheet-short'><br />
-        <input type="number" name='attr_bonus_athletics' value="0" class='sheet-short'><br />
-        <input type="number" name='attr_bonus_computers' value="0" class='sheet-short'><br />
+        <input type="number" name='attr_bonus_acrobatics' value="@{Agility}+@{Temp_Agility}" disabled="true" class='sheet-short'><br />
+        <input type="number" name='attr_bonus_athletics' value="@{Strength}+@{Temp_Strength}" disabled="true" class='sheet-short'><br />
+        <input type="number" name='attr_bonus_computers' value="@{Intelligence}+@{Temp_Intelligence}" disabled="true" class='sheet-short'><br />
         <h4 style="margin-bottom: 10px;">N/A</h4>
         <h4 style="margin-bottom: 10px;">N/A</h4>
-        <input type="number" name='attr_bonus_endurance' value="0" class='sheet-short'><br />
-        <input type="number" name='attr_bonus_influence' value="0" class='sheet-short'><br />
-        <input type="number" name='attr_bonus_leadership' value="0" class='sheet-short'><br />
-        <input type="number" name='attr_bonus_lore' value="0" class='sheet-short'><br />
-        <input type="number" name='attr_bonus_medicine' value="0" class='sheet-short'><br />
+        <input type="number" name='attr_bonus_endurance' value="@{Fortitude}+@{Temp_Fortitude}" disabled="true" class='sheet-short'><br />
+        <input type="number" name='attr_bonus_influence' value="@{Willpower}+@{Temp_Willpower}" disabled="true" class='sheet-short'><br />
+        <input type="number" name='attr_bonus_leadership' value="@{Willpower}+@{Temp_Willpower}" disabled="true" class='sheet-short'><br />
+        <input type="number" name='attr_bonus_lore' value="@{Intelligence}+@{Temp_Intelligence}" disabled="true" class='sheet-short'><br />
+        <input type="number" name='attr_bonus_medicine' value="@{Intelligence}+@{Temp_Intelligence}" disabled="true" class='sheet-short'><br />
         <h4 style="margin-bottom: 10px;">N/A</h4>
         <h4 style="margin-bottom: 10px;">N/A</h4>
-        <input type="number" name='attr_bonus_perception' value="0" class='sheet-short'><br />
-        <input type="number" name='attr_bonus_pilot' value="0" class='sheet-short'><br />
-        <input type="number" name='attr_bonus_psionics' value="0" class='sheet-short'><br />
+        <input type="number" name='attr_bonus_perception' value="@{Instinct}+@{Temp_Instinct}" disabled="true" class='sheet-short'><br />
+        <input type="number" name='attr_bonus_pilot' value="@{Instinct}+@{Temp_Instinct}" disabled="true" class='sheet-short'><br />
+        <input type="number" name='attr_bonus_psionics' value="@{Willpower}+@{Temp_Willpower}" disabled="true" class='sheet-short'><br />
         <h4 style="margin-bottom: 10px;">N/A</h4>
-        <input type="number" name='attr_bonus_science' value="0" class='sheet-short'><br />
-        <input type="number" name='attr_bonus_stealth' value="0" class='sheet-short'><br />
-        <input type="number" name='attr_bonus_survival' value="0" class='sheet-short'><br />
-        <input type="number" name='attr_bonus_tactics' value="0" class='sheet-short'><br />
+        <input type="number" name='attr_bonus_science' value="@{Intelligence}+@{Temp_Intelligence}" disabled="true" class='sheet-short'><br />
+        <input type="number" name='attr_bonus_stealth' value="@{Agility}+@{Temp_Agility}" disabled="true" class='sheet-short'><br />
+        <input type="number" name='attr_bonus_survival' value="@{Instinct}+@{Temp_Instinct}" disabled="true" class='sheet-short'><br />
+        <input type="number" name='attr_bonus_tactics' value="@{Intelligence}+@{Temp_Intelligence}" disabled="true" class='sheet-short'><br />
     
     </div>
     
@@ -429,42 +509,34 @@
         
         <h3 style="margin-bottom: 10px;">Total</h3>
         
-        <input type="number" name='attr_acrobatics' value="0" class='sheet-short'><br />
-        <input type="number" name='attr_athletics' value="0" class='sheet-short'><br />
-        <input type="number" name='attr_computers' value="0" class='sheet-short'><br />
-        <input type="number" name='attr_defensive_training' value="0" class='sheet-short'><br />
-        <input type="number" name='attr_durability' value="0" class='sheet-short'><br />
-        <input type="number" name='attr_endurance' value="0" class='sheet-short'><br />
-        <input type="number" name='attr_influence' value="0" class='sheet-short'><br />
-        <input type="number" name='attr_leadership' value="0" class='sheet-short'><br />
-        <input type="number" name='attr_lore' value="0" class='sheet-short'><br />
-        <input type="number" name='attr_medicine' value="0" class='sheet-short'><br />
-        <input type="number" name='attr_melee' value="0" class='sheet-short'><br />
-        <input type="number" name='attr_mental_training' value="0" class='sheet-short'><br />
-        <input type="number" name='attr_perception' value="0" class='sheet-short'><br />
-        <input type="number" name='attr_pilot' value="0" class='sheet-short'><br />
-        <input type="number" name='attr_psionics' value="0" class='sheet-short'><br />
-        <input type="number" name='attr_ranged' value="0" class='sheet-short'><br />
-        <input type="number" name='attr_science' value="0" class='sheet-short'><br />
-        <input type="number" name='attr_stealth' value="0" class='sheet-short'><br />
-        <input type="number" name='attr_survival' value="0" class='sheet-short'><br />
-        <input type="number" name='attr_tactics' value="0" class='sheet-short'><br />
+        <input type="number" name='attr_acrobatics' value="@{Ranks_Acrobatics}+(@{Bonus_Acrobatics})+@{Misc_Acrobatics}" disabled="true" class='sheet-short'><br />
+        <input type="number" name='attr_athletics' value="@{Ranks_Athletics}+(@{Bonus_Athletics})+@{Misc_Athletics}" disabled="true" class='sheet-short'><br />
+        <input type="number" name='attr_computers' value="@{Ranks_Computers}+(@{Bonus_Computers})+@{Misc_Computers}" disabled="true" class='sheet-short'><br />
+        <input type="number" name='attr_defensive_training' value="@{Ranks_Defensive_Training}+@{Misc_Defensive_Training}" disabled="true" class='sheet-short'><br />
+        <input type="number" name='attr_durability' value="@{Ranks_Durability}+@{Misc_Durability}" disabled="true" class='sheet-short'><br />
+        <input type="number" name='attr_endurance' value="@{Ranks_Endurance}+(@{Bonus_Endurance})+@{Misc_Endurance}" disabled="true" class='sheet-short'><br />
+        <input type="number" name='attr_influence' value="@{Ranks_Influence}+(@{Bonus_Influence})+@{Misc_Influence}" disabled="true" class='sheet-short'><br />
+        <input type="number" name='attr_leadership' value="@{Ranks_Leadership}+(@{Bonus_Leadership})+@{Misc_Leadership}" disabled="true" class='sheet-short'><br />
+        <input type="number" name='attr_lore' value="@{Ranks_Lore}+(@{Bonus_Lore})+@{Misc_Lore}" disabled="true" class='sheet-short'><br />
+        <input type="number" name='attr_medicine' value="@{Ranks_Medicine}+(@{Bonus_Medicine})+@{Misc_Medicine}" disabled="true" class='sheet-short'><br />
+        <input type="number" name='attr_melee' value="@{Ranks_Melee}+@{Misc_Melee}" disabled="true" class='sheet-short'><br />
+        <input type="number" name='attr_mental_training' value="@{Ranks_Mental_Training}+@{Misc_Mental_Training}" disabled="true" class='sheet-short'><br />
+        <input type="number" name='attr_perception' value="@{Ranks_Perception}+(@{Bonus_Perception})+@{Misc_Perception}" disabled="true" class='sheet-short'><br />
+        <input type="number" name='attr_pilot' value="@{Ranks_Pilot}+(@{Bonus_Pilot})+@{Misc_Pilot}" disabled="true" class='sheet-short'><br />
+        <input type="number" name='attr_psionics' value="@{Ranks_Psionics}+(@{Bonus_Psionics})+@{Misc_Psionics}" disabled="true" class='sheet-short'><br />
+        <input type="number" name='attr_ranged' value="@{Ranks_Ranged}+@{Misc_Ranged}" disabled="true" class='sheet-short'><br />
+        <input type="number" name='attr_science' value="@{Ranks_Science}+(@{Bonus_Science})+@{Misc_Science}" disabled="true" class='sheet-short'><br />
+        <input type="number" name='attr_stealth' value="@{Ranks_Stealth}+(@{Bonus_Stealth})+@{Misc_Stealth}" disabled="true" class='sheet-short'><br />
+        <input type="number" name='attr_survival' value="@{Ranks_Survival}+(@{Bonus_Survival})+@{Misc_Survival}" disabled="true" class='sheet-short'><br />
+        <input type="number" name='attr_tactics' value="@{Ranks_Tactics}+(@{Bonus_Tactics})+@{Misc_Tactics}" disabled="true" class='sheet-short'><br />
     
     </div>
     
 </div>
 
-<hr />
+</div>
 
-<h3 style="margin-bottom: 10px;">Specializations/ Evolutions/ Classes/ Directives/ Mutations:</h3>
-<textarea name="attr_specs"></textarea>
-
-<hr />
-
-<h3 style="margin-bottom: 10px;">Talents</h3>
-<textarea name="attr_talents"></textarea>
-
-<hr />
+<div class="sheet-powers">
 
 <div class="sheet-3colrow">
     
@@ -574,69 +646,9 @@
     
 </div>
 
-<hr />
-
-<h2 style="margin-bottom: 10px;">Vehicles</h2>
-
-<div class="sheet-2colrow">
-    
-    <div class="sheet-col">
-        
-        <label>Vehicle:</label><strong class='vehicle'></strong><input type="text" name="attr_vehicle" /><br />
-        <label>Shield Armor (Protoss):</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_shield_armor" /><br />
-        <label>Defense:</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_defense" /><br />
-        <label>Damage Resistance:</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_dr" /><br />
-        <label>Move Speed:</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_speed" /><br />
-        <label>Acceleration Rating:</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_accel" /><br />
-        
-    </div>
-    
-    <div class="sheet-col">
-        
-        <label>Hit Points</label><strong class='vehicle'></strong><input type="number" name='attr_current_vehicle_hp' class='sheet-short'>/<input type="number" name='attr_max_vehicle_hp' class='sheet-short'><br />
-        <label>Shields (Protoss)</label><strong class='vehicle'></strong><input type="number" name='attr_current_vehicle_shields' class='sheet-short'>/<input type="number" name='attr_max_vehicle_shields' class='sheet-short'><br />
-        <label>Toughness:</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_toughness" /><br />
-        <label>Damage Threshold:</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_dt" /><br />
-        <label>Shift Speed:</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_shift" /><br />
-        <label>Max Speed:</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_max" /><br />
-        
-    </div>
-    
 </div>
 
-<fieldset class="repeating_vehicles">
-    
-    <hr />
-    
-    <div class="sheet-2colrow">
-        
-        <div class="sheet-col">
-            
-            <label>Vehicle:</label><strong class='vehicle'></strong><input type="text" name="attr_vehicle" /><br />
-            <label>Shield Armor (Protoss):</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_shield_armor" /><br />
-            <label>Defense:</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_defense" /><br />
-            <label>Damage Resistance:</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_dr" /><br />
-            <label>Move Speed:</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_speed" /><br />
-            <label>Acceleration Rating:</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_accel" /><br />
-            
-        </div>
-        
-        <div class="sheet-col">
-            
-            <label>Hit Points</label><strong class='vehicle'></strong><input type="number" name='attr_current_vehicle_hp' class='sheet-short'>/<input type="number" name='attr_max_vehicle_hp' class='sheet-short'><br />
-            <label>Shields (Protoss)</label><strong class='vehicle'></strong><input type="number" name='attr_current_vehicle_shields' class='sheet-short'>/<input type="number" name='attr_max_vehicle_shields' class='sheet-short'><br />
-            <label>Toughness:</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_toughness" /><br />
-            <label>Damage Threshold:</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_dt" /><br />
-            <label>Shift Speed:</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_shift" /><br />
-            <label>Max Speed:</label><strong class='vehicle'></strong><input type="number" name="attr_vehicle_max" /><br />
-            
-        </div>
-        
-    </div>
-    
-</fieldset>
-
-<hr />
+<div class="sheet-equipment">
 
 <h2 style="margin-bottom: 10px;">Equipment</h2>            
 <label>Carry Weight <input type="number" name='attr_current_weight' class='sheet-short'>/<input type="number" name='attr_max_weight' class='sheet-short'></label><strong class='carry'></strong><br />
@@ -653,6 +665,18 @@
 <label>Equipped Items</label><strong class='carry'></strong>
 <textarea name="attr_equipped"></textarea>
 
+</div>
+
+<div class="sheet-traits">
+
+<h3 style="margin-bottom: 10px;">Specializations/ Evolutions/ Classes/ Directives/ Mutations:</h3>
+<textarea name="attr_specs"></textarea>
+
+<hr />
+
+<h3 style="margin-bottom: 10px;">Talents</h3>
+<textarea name="attr_talents"></textarea>
+
 <hr />
 
 <label>Special Traits and Abilities</label><strong class='traits'></strong>
@@ -662,3 +686,5 @@
 
 <label>Other</label><strong class='other'></strong>
 <textarea name="attr_other"></textarea>
+
+</div>