diff --git a/FASATrek/FASATrek.html b/FASATrek/FASATrek.html
index cdef63a50c..c9747bcd79 100644
--- a/FASATrek/FASATrek.html
+++ b/FASATrek/FASATrek.html
@@ -1,10 +1,17 @@
+
+<!-- Quick(tm) Update Log
+V1.0 - Initial release. 
+V1.1 - Update. Includes more skills, and fixes for formatting, calcuations. Unix EOL formatting.
+
+Below, commented out for Roll20 deployment. Left in for testing.
 <head>
   <link rel="stylesheet" href="FASATrek.css" type="text/css">
 </head>
+-->
 
-<div class="sheet-row full-width">
-<h1>FASA Trek Character Data Record 1.0</h1>
-    <div class="third-width">
+<div class='sheet-2colrow'>
+<h1>FASA Trek Character Data Record 1.1</h1>
+    <div class='sheet-col'>
 
     	<label>Name:</label><input  type="text" name="attr_character_name" />
 		<label>Rank:</label><input type="text" name="attr_rank" />
@@ -14,43 +21,39 @@
 
 	</div>
 	
-	<div class="third-width">
+	<div class='sheet-col'>
 
     	<label>Organization:</label><input type="text" name="attr_character_org" />
 		<label>Division:</label><input type="text" name="attr_character_div" />
 		<label>Posting(Ship):</label><input type="text" name="attr_character_ship" />
 		<label>Position:</label><input type="text" name="attr_character_position" />
 
-	</div>
-	<div class="third-width">
-	logo or image goes here
-	</div>
-	
+	</div>		
 </div>
 
 <hr/>
-<div class="sheet-row full-width">
+<div class='sheet-2colrow'>
 		<h3>Attributes and Tactical Skills</h3>
-		<div class="half-width">
-<label for="attr_strength">STR:</label><input type="number" name='attr_strength' class='input_short'>
-<label for="attr_endurance">END:</label><input type="number" name='attr_endurance' class='input_short'>
-<label for="attr_intelligence">INT:</label><input type="number" name='attr_intelligence' class='input_short' value="80">
-<label for="attr_dexterity">DEX:</label><input type="number" name='attr_dexterity' class='input_short'>
-<label for="attr_charisma">CHA:</label><input type="number" name='attr_charisma' class='input_short'>
-<label for="attr_luck">LUC:</label><input type="number" name='attr_luck' class='input_short'>
-<label for="attr_psionic">PSI:</label><input type="number" name='attr_psionic' class='input_short'>
-<br/>
-<label for="attr_MaxOpEnd">Max Op End:</label><input type="number" name='attr_MaxOpEnd' class='input_short'>
-<label for="attr_CurOpEnd">Cur Op End:</label><input type="number" name='attr_CurOpEnd' class='input_short'>
-<label>Inact Save:</label><input type="number" class='input_short' value=20>
-<label>Unc Thresh:</label><input type="number" class='input_short' value=5>
-<br/>
-<label>Wound Rate:</label><input type="number" class='input_short' value="floor(@{attr_endurance}/20)" disabled="true">
-<label>Fatig Rate:</label><input type="number" class='input_short' value="floor(@{attr_endurance}/10)" disabled="true">
-<label>Bare-Hand Damage: </label><input type="text" class='input_short' value="1d10+3">
-<label><b>AP</b>: </label><input type="number" class='input_short' value="(floor(@{attr_dexterity}/10)+4)" disabled="true">
-</div>
-<div class="sheet-col half-width">
+	<div class='sheet-col'>
+	<label for="attr_strength">STR:</label><input type="number" name='attr_strength' class='input_short'>
+	<label for="attr_endurance">END:</label><input type="number" name='attr_endurance' class='input_short'>
+	<label for="attr_intelligence">INT:</label><input type="number" name='attr_intelligence' class='input_short' value="80">
+	<label for="attr_dexterity">DEX:</label><input type="number" name='attr_dexterity' class='input_short'>
+	<label for="attr_charisma">CHA:</label><input type="number" name='attr_charisma' class='input_short'>
+	<label for="attr_luck">LUC:</label><input type="number" name='attr_luck' class='input_short'>
+	<label for="attr_psionic">PSI:</label><input type="number" name='attr_psionic' class='input_short'>
+	<br/>
+	<label for="attr_MaxOpEnd">Max Op End:</label><input type="number" name='attr_MaxOpEnd' class='input_short'>
+	<label for="attr_CurOpEnd">Cur Op End:</label><input type="number" name='attr_CurOpEnd' class='input_short'>
+	<label>Inact Save:</label><input type="number" class='input_short' value=20>
+	<label>Unc Thresh:</label><input type="number" class='input_short' value=5>
+	<br/>
+	<label>Wound Rate:</label><input type="number" class='input_short' value="floor(@{endurance}/20)" disabled="true">
+	<label>Fatig Rate:</label><input type="number" class='input_short' value="floor(@{endurance}/10)" disabled="true">
+	<label>Bare-Hand Damage: </label><input type="text" class='input_short' value="1d10+3">
+	<label><b>AP</b>: </label><input type="number" class='input_short' value="(floor(@{dexterity}/10)+4)" disabled="true">
+	</div>
+<div class='sheet-col'>
 		<table class="full-width">
             <thead>
                 <tr>
@@ -63,35 +66,84 @@
             </thead>
             <tbody>
                 <tr>
-                    <td>Mark. Mod: </td>
-					<td><input type="number" name="attr_MrksMod" class="input_short" value="round((@{attr_dexterity}+@{attr_MrksMod})/2)" disabled="true" /></td>
-                    <td>Helm Ops</td>
-                    <td><input type="number" name="attr_SSHelmOps" class="input_short" value="round((@{attr_intelligence}+@{attr_SSHelmOps})/2)" disabled="true" /></td>
+                    <td>Leadership: </td>
+					<td><input type="number" name="attr_DLeadership" class="input_short" value="round((@{charisma}+@{Leadership})/2)" disabled="true" /></td>
+                    <td>Combat Strategy/Tactics:</td>
+                    <td><input type="number" name="attr_DSSComTactics" class="input_short" value="round((@{intelligence}+@{SSComTactics})/2)" disabled="true" /></td>		
+                </tr>
+				<tr>
+                    <td>Marks. Mod: </td>
+					<td><input type="number" name="attr_DMrksMod" class="input_short" value="round((@{dexterity}+@{MrksMod})/2)" disabled="true" /></td>
+                    <td>Comm. System Ops:</td>
+                    <td><input type="number" name="attr_DSSCommOps" class="input_short" value="round((@{intelligence}+@{SSCommOps})/2)" disabled="true" /></td>					
+                </tr>
+                 <tr>
+                    <td>Medicine-First Aid: </td>
+					<td><input type="number" name="attr_DMedFirstAid" class="input_short" value="round((@{intelligence}+@{MedFirstAid})/2)" disabled="true" /></td>
+                    <td>DamCon Procedures:</td>
+                    <td><input type="number" name="attr_DSSDamCon" class="input_short" value="round((@{intelligence}+@{SSDamCon})/2)" disabled="true" /></td>					
+                </tr>
+				 <tr>
+                    <td>Pers. Combat Armed: </td>
+					<td><input type="number" name="attr_DPCArmed" class="input_short" value="round((@{dexterity}+@{PCArmed})/2)" disabled="true" /></td>
+                    <td>Helm Ops:</td>
+                    <td><input type="number" name="attr_DSSHelmOps" class="input_short" value="round((@{intelligence}+@{SSHelmOps})/2)" disabled="true" /></td>					
+                </tr>
+				<tr>
+                    <td>Pers. Combat Unarmed: </td>
+					<td><input type="number" name="attr_DPCUnarmed" class="input_short" value="round((@{dexterity}+@{PCUnarmed})/2)" disabled="true" /></td>
+                    <td>Sensors:</td>
+                    <td><input type="number" name="attr_DSSensors" class="input_short" value="round((@{intelligence}+@{SSSensors})/2)" disabled="true" /></td>					
+                </tr>
+				<tr>
+                    <td>Security Procedures: </td>
+					<td><input type="number" name="attr_DSecProcedures" class="input_short" value="round((@{intelligence}+@{SecProcedures})/2)" disabled="true" /></td>
+                    <td>Shield Ops:</td>
+                    <td><input type="number" name="attr_DSShieldOps" class="input_short" value="round((@{intelligence}+@{SSShieldOps})/2)" disabled="true" /></td>
+                </tr>
+				<tr>
+                    <td>Sm Equipment Ops: </td>
+					<td><input type="number" name="attr_DSmEquipOps" class="input_short" value="round((@{intelligence}+@{SmEquipOps})/2)" disabled="true" /></td>
+                    <td>Warp Drive Tech:</td>
+                    <td><input type="number" name="attr_DSSWarTech" class="input_short" value="round((@{intelligence}+@{SSWarpTech})/2)" disabled="true" /></td>
+                </tr>
+				<tr>
+                    <td>Sm Unit Tactics: </td>
+					<td><input type="number" name="attr_DSmUnitTactics" class="input_short" value="round((@{intelligence}+@{SmUnitTactics})/2)" disabled="true" /></td>
+                    <td>Weapon Ops:</td>
+                    <td><input type="number" name="attr_DSSWeaponOps" class="input_short" value="round((@{intelligence}+@{SSWeaponOps})/2)" disabled="true" /></td>
                 </tr>
-                
             </tbody>
         </table>
 	</div>
 </div>
 
- <div class="sheet-row full-width">
+ <div class='sheet-3colrow'>
      
         <h3 class="full-wdith">Skills</h3>
-<div class="third-width">
+<div class='sheet-col'>
 <h3>Away Team Skills</h3>
 <label>Env. Suit Ops: </label><input type="number" name="attr_EnvSuit" class="input_short" value="25" /><br/>
+<label>Medicine-First Aid: </label><input type="number" name="attr_MedFirstAid" class="input_short" value="25" /><br/>
+<label>Leadership: </label><input type="number" name="attr_Leadership" class="input_short" /><br/>
 <label>Marks. Archaic: </label><input type="number" name="attr_MrksArc1" class="input_short" value="25" /><br/>
 <label>Marks. Mod: </label><input type="number" name="attr_MrksMod" class="input_short" value="25" /><br/>
+<label>Negotiation/Diplomacy: </label><input type="number" name="attr_NegDip" class="input_short" /><br/>
 <label>Pers. Combat Armed: </label><input type="number" name="attr_PCArmed" class="input_short" value="25" /><br/>
 <label>Pers. Combat Unarmed: </label><input type="number" name="attr_PCUnarmed" class="input_short" value="25" /><br/>
+<label>Pers. Weapons Tech: </label><input type="number" name="attr_PersWeapTech" class="input_short" value="25" /><br/>
 <label>Security Procedures: </label><input type="number" name="attr_SecProcedures" class="input_short" value="25" /><br/>
 <label>Sm Equipment Ops: </label><input type="number" name="attr_SmEquipOps" class="input_short" value="25" /><br/>
+<label>Sm Equipment Tech: </label><input type="number" name="attr_SmEquipTech" class="input_short" value="25" /><br/>
+<label>Sm Unit Tactics: </label><input type="number" name="attr_SmUnitTactics" class="input_short" value="25" /><br/>
+<label>Streetwise: </label><input type="number" name="attr_Streetwise" class="input_short" value="25" /><br/>
+<label>Zero-G Ops: </label><input type="number" name="attr_ZeroGeeOps" class="input_short" value="25" /><br/>
 </div>
-<div class="third-width">
+<div class='sheet-col'>
 <h3>Starship Skills</h3>
 <label>Combat Strategy/Tactics: </label><input type="number" name="attr_SSComTactics" class="input_short" value="65" /><br/>
-<label>Comm System Ops: </label><input type="number" name="attr_SSShieldOps" class="input_short" value="65" /><br/>
-<label>Comm System Tech: </label><input type="number" name="attr_SSShieldTech" class="input_short" value="65" /><br/>
+<label>Comm System Ops: </label><input type="number" name="attr_SSCommOps" class="input_short" value="65" /><br/>
+<label>Comm System Tech: </label><input type="number" name="attr_SSCommTech" class="input_short" value="65" /><br/>
 <label>Computer Ops: </label><input type="number" name="attr_SSCompOps" class="input_short" value="65" /><br/>
 <label>Computer Tech: </label><input type="number" name="attr_SSCompTech" class="input_short" value="65" /><br/>
 <label>DamCon Procedures: </label><input type="number" name="attr_SSDamCon" class="input_short" value="65" /><br/>
@@ -103,24 +155,28 @@
 <label>Shuttle Tech: </label><input type="number" name="attr_SSShuttleTech" class="input_short" value="65" /><br/>
 <label>Transporter Ops: </label><input type="number" name="attr_SSTransOps" class="input_short" value="65" /><br/>
 <label>Transporter Tech: </label><input type="number" name="attr_SSTransTech" class="input_short" value="65" /><br/>
+<label>Warp Drive Tech: </label><input type="number" name="attr_SSWarpTech" class="input_short" value="65" /><br/>
 <label>Weapon Ops: </label><input type="number" name="attr_SSWeaponOps" class="input_short" value="65" /><br/>
 <label>Weapon Tech: </label><input type="number" name="attr_SSWeaponTech" class="input_short" value="65" /><br/>
 
 </div>
-<div class="third-width">
+<div class='sheet-col'>
 <h3>Other Skills</h3>
 <label>Administration: </label><input type="number" name="attr_Admin" class="input_short" /><br/>
 <label>Carousing: </label><input type="number" name="attr_Carousing" class="input_short" /><br/>
 <label>Electronics Technology: </label><input type="number" name="attr_ElecTech" class="input_short" /><br/>
-<label>Electronics Technology: </label><input type="number" name="attr_ElecTech" class="input_short" /><br/>
+<label>General Medicine: </label><input type="number" name="attr_GenMedicine" class="input_short" /><br/>
 <label>Instruction: </label><input type="number" name="attr_Instruction" class="input_short" /><br/>
-<label>Leadership: </label><input type="number" name="attr_Leadership" class="input_short" /><br/>
 <label>Life Sup. Sys. Technology: </label><input type="number" name="attr_LifeTech" class="input_short" /><br/>
 <label>Mechanical Engineering: </label><input type="number" name="attr_MechEng" class="input_short" /><br/>
-<label>General Medicine: </label><input type="number" name="attr_GenMedicine" class="input_short" /><br/>
-<label>Negotiation/Diplomacy: </label><input type="number" name="attr_NegDip" class="input_short" /><br/>
+<label>SS Astrogation: </label><input type="number" name="attr_SSAstrogation" class="input_short" /><br>
+<label>SS Astronautics: </label><input type="number" name="attr_SSAstronautics" class="input_short" /><br/>
+
 </div>
 </div>
+<textarea rows="20" cols="150">
+Use this area to record other skills, such as those with numerous specialities or custom skills. 
+</textarea>