diff --git a/Eclipse Phase/Eclipse Phase.html b/Eclipse Phase/Eclipse Phase.html
index 6eaa3658ef..b6771e1794 100644
--- a/Eclipse Phase/Eclipse Phase.html	
+++ b/Eclipse Phase/Eclipse Phase.html	
@@ -133,7 +133,7 @@
                             <td><div class="sheet-backwhite_center" ><input class="input" type="number" value="0" name="attr_wt" /></div></td>
                             <td><div class="sheet-backwhite_center" ><input class="input" type="number" value="0" name="attr_dur" /></div></td>
                             <td><div class="sheet-backwhite_center" ><input class="input" type="number" value="0" name="attr_dr" /></div></td>
-                            <td><div class="sheet-backwhite_center" ><input class="input" type="number" value="0" name="attr_int" /></div></td>
+                            <td><div class="sheet-backwhite_center" ><input class="input" type="number" value="0" name="attr_int-stat" /></div></td>
                             <td><div class="sheet-backwhite_center" ><input class="input" type="number" value="0" name="attr_spd" /></div></td>
                             <td><div class="sheet-backwhite_center" ><input class="input" type="number" value="0" name="attr_db" /></div></td>
                         </tr>
@@ -218,7 +218,7 @@
                     <tr>
                         <td><button class="sheet-skill_button" type='roll' name="attr_randomskill_roll" value='/em @{character_name} rolls @{randomskill_name}: [[1d100]], compared to [[0d1 + @{randomskill_total}]]' /></td>
                         <td><input class="sheet-backwhite_right" type="text" value="" name="attr_randomskill_name" /></td>
-                        <td><select class ="sheet-backwhite_center" name="attr_randomskill_select" value="0" style="width:70px">
+                        <td><select class="sheet-backwhite_center" name="attr_randomskill_select" value="0" style="width:70px">
                                 <option value="0"> </option>
                                 <option value="@{cog}">COG</option>
                                 <option value="@{coo}">COO</option>
@@ -228,9 +228,9 @@
                                 <option value="@{som}">SOM</option>
                                 <option value="@{wil}">WIL</option></select></td>
                         <td><input class="sheet-backwhite_center" type="number" value='@{randomskill_select}' name="attr_randomskill_apt_rating" disabled="true" /></td>
-                        <td><input type="number" style="width:100px" value="" name="attr_randomskill_base"/></td>
-                        <td><input class="sheet-backwhite_center" style="width:100%" type="number" value="@{randomskill_base} + @{randomskill_select}" name="attr_randomskill_total" disabled="true"/></td>
-                        <td><input type="number" name="attr_randomskill_otherbonus" style="width:100px"/></td>
+                        <td><input class="sheet-backwhite_center" type="number" style="width:100px" value="" name="attr_randomskill_base"/></td>
+                        <td><input class="sheet-backwhite_center" type="number" style="width:100%" value="@{randomskill_base} + @{randomskill_select}" name="attr_randomskill_total" disabled="true"/></td>
+                        <td><input class="sheet-backwhite_center" type="number" name="attr_randomskill_otherbonus" style="width:100px"/></td>
                     </tr>
                 </table>
                 </fieldset>
@@ -265,9 +265,9 @@
                                 <option value="@{som}">SOM</option>
                                 <option value="@{wil}">WIL</option></select></td>
                         <td><input class="sheet-backwhite_center" type="number" value='@{knowledgeskill_select}' name="attr_knowledgeskill_apt_rating" disabled="true" /></td>
-                        <td><input type="number" style="width:100px" value="" name="attr_knowledgeskill_base"/></td>
+                        <td><input class="sheet-backwhite_center" type="number" style="width:100px" value="" name="attr_knowledgeskill_base"/></td>
                         <td><input class="sheet-backwhite_center" style="width:100%" type="number" value="@{knowledgeskill_base} + @{knowledgeskill_select}" name="attr_knowledgeskill_total" disabled="true"/></td>
-                        <td><input type="number" name="attr_knowledgeskil;_otherbonus" style="width:100px"/></td>
+                        <td><input class="sheet-backwhite_center" type="number" name="attr_knowledgeskill_otherbonus" style="width:100px"/></td>
                     </tr>
                 </table>
                 <fieldset class="repeating_additionalknowledge"> 
@@ -275,7 +275,7 @@
                     <tr>
                         <td><button class="sheet-skill_button" type='roll' name="attr_aknowledgeskill_roll" value='/em @{character_name} rolls @{aknowledgeskill_name} (@{aknowledgeskill_type}): [[1d100]], compared to [[0d1 + @{aknowledgeskill_total}]]' /></td>
                         <td><input class="sheet-backwhite_right" type="text" value="" name="attr_aknowledgeskill_name" style="width:50%" /><input class="sheet-backwhite_right" type="text" value="" placeholder="Knowledge Type" name="attr_aknowledgeskill_type" style="width:50%" /></td>
-                        <td><select class ="sheet-backwhite_center" name="attr_aknowledgeskill_select" value="0" style="width:70px">
+                        <td><select class="sheet-backwhite_center" name="attr_aknowledgeskill_select" value="0" style="width:70px">
                                 <option value="0"> </option>
                                 <option value="@{cog}">COG</option>
                                 <option value="@{coo}">COO</option>
@@ -285,9 +285,9 @@
                                 <option value="@{som}">SOM</option>
                                 <option value="@{wil}">WIL</option></select></td>
                         <td><input class="sheet-backwhite_center" type="number" value='@{aknowledgeskill_select}' name="attr_aknowledgeskill_apt_rating" disabled="true" /></td>
-                        <td><input type="number" style="width:100px" value="" name="attr_aknowledgeskill_base"/></td>
+                        <td><input class="sheet-backwhite_center" type="number" style="width:100px" value="" name="attr_aknowledgeskill_base"/></td>
                         <td><input class="sheet-backwhite_center" style="width:100%" type="number" value="@{aknowledgeskill_base} + @{aknowledgeskill_select}" name="attr_aknowledgeskill_total" disabled="true"/></td>
-                        <td><input type="number" name="attr_aknowledgeskill_otherbonus" style="width:100px"/></td>
+                        <td><input class="sheet-backwhite_center" type="number" name="attr_aknowledgeskill_otherbonus" style="width:100px"/></td>
                     </tr>
                 </table>
                 </fieldset>
@@ -407,7 +407,7 @@
                 <th class="sheet-table_stats-heading" style="font-size:0.8em" align="right" >Implants / Enhancements / Customizations</th>
             </tr>
             </table>
-            <textarea class="sheet-textarea" style="width:98%" rows="4" wrap="soft" type="text" value="" name="attr_morph_traits" align="center"/></textarea>
+            <textarea class="sheet-textarea" style="width:98%" rows="4" wrap="soft" type="text" value="" name="attr_implants_enhancement_customizations" align="center"/></textarea>
         </div>
     </div>
 </div>
@@ -531,6 +531,25 @@
                 <table>
                     <textarea class="sheet-textarea" style="width:87.5%" rows="4" wrap="soft" type="text" value="" name="attr_armor_notes" placeholder="Armor Notes" /></textarea>
                 </table>
+                <fieldset class="repeating_armor">
+                    <table class="sheet-table_stats">
+                        <tr>
+                            <th class="sheet-table_stats-heading" style="font-size:1.0em" >Armor</th>
+                            <th class="sheet-table_stats-heading" style="font-size:0.8em" >Energy Value</th>
+                            <th class="sheet-table_stats-heading" style="font-size:0.8em" >Kinetic Value</th>
+                            <th class="sheet-table_stats-heading" style="font-size:0.8em" >Reference</th>
+                        </tr>
+                        <tr>
+                            <td><input class="sheet-backwhite_right" type="text" value"" name="attr_armor_name_repeating"/></td>
+                            <td><input class="sheet-backwhite_center" type="number" value"" name="attr_armor_name_repeating" style="width:100%"/></td>
+                            <td><input class="sheet-backwhite_center" type="number" value"" name="attr_armor_name_repeating" style="width:100%"/></td>
+                            <td><input class="sheet-backwhite_center" type="number" value"" name="attr_armor_name_repeating" style="width:100%"/></td>
+                        </tr>
+                    </table>
+                    <table>
+                        <textarea class="sheet-textarea" style="width:87.5%" rows="4" wrap="soft" type="text" value="" name="attr_armor_notes_repeating" placeholder="Armor Notes" /></textarea>
+                    </table>
+                </fieldset>
             </div>
         </div>
     </div>
@@ -562,6 +581,31 @@
                 <table>
                     <textarea class="sheet-textarea" style="width:98.5%" rows="4" wrap="soft" type="text" value="" name="attr_wpn_notes" placeholder="Weapon Notes" /></textarea>
                 </table>
+                <fieldset class="repeating_weapon">
+                    <table class="sheet-table_stats">
+                        <tr>
+                            <th class="sheet-table_stats-heading" style="font-size:1.0em" >Weapon</th>
+                            <th class="sheet-table_stats-heading" style="font-size:0.8em" >Type</th>
+                            <th class="sheet-table_stats-heading" style="font-size:0.8em" >AP</th>
+                            <th class="sheet-table_stats-heading" style="font-size:0.8em" >DV</th>
+                            <th class="sheet-table_stats-heading" style="font-size:0.8em" >Average DV</th>
+                            <th class="sheet-table_stats-heading" style="font-size:0.8em" >Firing Modes</th>
+                            <th class="sheet-table_stats-heading" style="font-size:0.8em" >Ammo</th>
+                        </tr>
+                        <tr>
+                            <td><input class="sheet-backwhite_right" type="text" value"" name="attr_weapon_name_repeating" style="width:100%" /></td>
+                            <td><input class="sheet-backwhite_center" type="text" value"" name="attr_weapon_type_repeating" style="width:100%"/></td>
+                            <td><input class="sheet-backwhite_center" type="number" value"" name="attr_weapon_ap_repeating" style="width:100%"/></td>
+                            <td><input class="sheet-backwhite_center" type="text" value"" name="attr_weapon_dv_repeating" style="width:100%"/></td>
+                            <td><input class="sheet-backwhite_center" type="number" value"" name="attr_weapon_avg_dv_repeating" style="width:100%"/></td>
+                            <td><input class="sheet-backwhite_center" type="text" value"" name="attr_weapon_firing_mode_repeating" style="width:100%"/></td>
+                            <td><input class="sheet-backwhite_center" type="text" value"" name="attr_weapon_ammo_repeating" style="width:100%"/></td>
+                        </tr>
+                    </table>
+                    <table>
+                        <textarea class="sheet-textarea" style="width:98.5%" rows="4" wrap="soft" type="text" value="" name="attr_wpn_notes_repeating" placeholder="Weapon Notes" /></textarea>
+                    </table>
+                </fieldset>
             </div>
         </div>
     </div>