diff --git a/Star Wars Edge of the Empire/EotE.html b/Star Wars Edge of the Empire/EotE.html
index 305ff38cf7..9a2ee1ff59 100644
--- a/Star Wars Edge of the Empire/EotE.html	
+++ b/Star Wars Edge of the Empire/EotE.html	
@@ -28,6 +28,12 @@
     </div>
     <div class='sheet-col sheet-moveup'>
         <table>
+            <tr class="sheet-border-row">
+                <td>&nbsp;</td>
+                <td>
+                    &nbsp;&nbsp;Current&nbsp;/&nbsp;Max
+                </td>
+            </tr>
             <tr class="sheet-border-row">
                 <td class="sheet-label">Experience Spent</td>
                 <td><input type="text" name="attr_experience" class="sheet-short" />&nbsp;/&nbsp;<input type="text" name="attr_experience_max" class="sheet-short" /></td>
@@ -40,20 +46,17 @@
                 <td class="sheet-label">Wound Threshold</td>
                 <td><input type="text" name="attr_wound_treshold" class="sheet-short" />&nbsp;/&nbsp;<input type="text" name="attr_wound_treshold_max" class="sheet-short" /></td>
             </tr>
-            <tr>
+            <tr class="sheet-border-row">
+                <td class="sheet-label">Encumbrance</td>
+                <td><input type="text" name="attr_encumbrance" class="sheet-short" />&nbsp;/&nbsp;<input type="text" name="attr_encumbrance_max" class="sheet-short" /></td>
+            </tr>
+            <tr class="sheet-border-row">
                 <td class="sheet-label">Defense</td>
-                <td>
-                    <table>
-                        <tr class="sheet-border-row">
-                            <td class="sheet-subheader">Ranged</td>
-                            <td class="sheet-subheader" style="padding-left: 5px;">Melee</td>
-                        </tr>
-                        <tr class="sheet-border-row">
-                            <td><input type="text" name="attr_defense_ranged" class="sheet-short" /></td>
-                            <td style="padding-left: 5px;"><input type="text" name="attr_defense_melee" class="sheet-short" /></td>
-                        </tr>
-                    </table>
-                </td>
+                <td>&nbsp;&nbsp;Ranged&nbsp;/&nbsp;Melee</td>
+            </tr>
+            <tr class="sheet-border-row">
+                <td class="sheet-label">&nbsp;</td>
+                <td><input type="text" name="attr_defense_ranged" class="sheet-short" />&nbsp;/&nbsp;<input type="text" name="attr_defense_melee" class="sheet-short" /></td>
             </tr>
             <tr class="sheet-border-row">
                 <td class="sheet-label">Soak</td>
@@ -128,6 +131,11 @@
                         <td align="center"><input type="checkbox" name="attr_coerce_trained" /></td>
                         <td style="padding-left: 5px;"><input type="text" class="sheet-short" name="attr_coerce" /></td>
                     </tr>
+                    <tr>
+                        <td>Cool</td>
+                        <td align="center"><input type="checkbox" name="attr_cool_trained" /></td>
+                        <td style="padding-left: 5px;"><input type="text" class="sheet-short" name="attr_cool" /></td>
+                    </tr>
                     <tr>
                         <td>Computers</td>
                         <td align="center"><input type="checkbox" name="attr_computers_trained" /></td>
@@ -299,7 +307,7 @@
     </div>
 </div>
 
-<div style="height: 25px;">&nbsp;</div>
+<div style="height: 15px;">&nbsp;</div>
 
 <div class="sheet-borderarea">
     <div class="sheet-borderarea-label">
@@ -325,7 +333,7 @@
     </fieldset>
 </div>
 
-<div style="height: 25px;">&nbsp;</div>
+<div style="height: 15px;">&nbsp;</div>
 
 <div class="sheet-borderarea">
     <div class="sheet-borderarea-label">
@@ -343,7 +351,7 @@
             <td class="sheet-longfield sheet-label">Notes</td>
         </tr>
     </table>
-    <fieldset class="repeating_talents">
+    <fieldset class="repeating_weapons">
         <table class="sheet-border-row">
             <tr>
                 <td class="sheet-longfield"><input type="text" class="sheet-longfield" name="attr_weapon_name" /></td>
@@ -358,6 +366,37 @@
     </fieldset>
 </div>
 
+<div style="height: 15px;">&nbsp;</div>
+
+<div class="sheet-borderarea">
+    <div class="sheet-borderarea-label">
+        Armor        
+    </div>
+
+    <table class="sheet-border-row sheet-moveup">
+        <tr>
+            <td class="sheet-longfield sheet-label">Armor Type</td>
+            <td class="sheet-short sheet-label">Defense</td>
+            <td class="sheet-short sheet-label">Soak</td>
+            <td class="sheet-short sheet-label">Enc</td>
+            <td class="sheet-short sheet-label">HP</td>
+            <td class="sheet-longfield sheet-label">Notes</td>
+        </tr>
+    </table>
+    <fieldset class="repeating_armor">
+        <table class="sheet-border-row">
+            <tr>
+                <td class="sheet-longfield"><input type="text" class="sheet-longfield" name="attr_armor_type" /></td>
+                <td class="sheet-short"><input type="text" class="sheet-short" name="attr_armor_def" /></td>
+                <td class="sheet-short"><input type="text" class="sheet-short" name="attr_armor_soak" /></td>
+                <td class="sheet-short"><input type="text" class="sheet-short" name="attr_armor_enc" /></td>
+                <td class="sheet-short"><input type="text" class="sheet-short" name="attr_armor_hp" /></td>
+                <td class="sheet-longfield"><input type="text" class="sheet-longfield" name="attr_armor_notes" /></td>
+            </tr>
+        </table>
+    </fieldset>
+</div>
+
 <div style="height: 25px;">&nbsp;</div>
 
 <div class='sheet-3colrow'>
@@ -365,8 +404,21 @@
         <div class="sheet-borderarea-label">
             Items        
         </div>
+        <table class="sheet-moveup">
+            <tr>
+                <td class="sheet-longfield sheet-label">Description</td>
+                <td class="sheet-short sheet-label">Enc</td>
+            </tr>
+        </table>
         <fieldset class="repeating_items sheet-moveup">
-            <input class="sheet-vlongfield" type="text" name="attr_item_name" />
+            <table>
+                <tr>
+                    <td class="sheet-longfield"><input class="sheet-longfield" type="text" name="attr_item_name" /></td>
+                    <td class="sheet-short"><input type="text" class="sheet-short" name="attr_item_enc" /></td>
+                </tr>
+            </table>
+        
+            
         </fieldset>
     </div>
     <div class='sheet-col'>
@@ -375,7 +427,7 @@
         </div>
         <fieldset class="repeating_motivations sheet-moveup">
             <input type="text" name="attr_motivation" class="sheet-vlongfield" /> <br />
-            <textarea class="sheet-vlongfield" height="150px"></textarea>
+            <textarea name="attr_motivation_desc" class="sheet-vlongfield" height="150px"></textarea>
         </fieldset>
     </div>
     <div class='sheet-col'>
@@ -391,12 +443,12 @@
         <fieldset class="repeating_obligations">
             <table>
                 <tr>
-                    <td class="sheet-longfield"><input type="text" class="sheet-longfield" name="attr_motovation_name" /></td>
-                    <td class="sheet-short"><input type="text" class="sheet-short" name="attr_motovation_value" /></td>
+                    <td class="sheet-longfield"><input type="text" class="sheet-longfield" name="attr_obligation_name" /></td>
+                    <td class="sheet-short"><input type="text" class="sheet-short" name="attr_obligation_value" /></td>
                 </tr>
                 <tr>
                     <td colspan="2">
-                        <textarea class="sheet-vlongfield" height="150px"></textarea>
+                        <textarea name="attr_obligation_desc class="sheet-vlongfield" height="150px"></textarea>
                     </td>
                 </tr>
             </table>