diff --git a/templates/actor/actor-sheet.html b/templates/actor/actor-sheet.html
index fd29775..fa78b40 100644
--- a/templates/actor/actor-sheet.html
+++ b/templates/actor/actor-sheet.html
@@ -353,19 +353,17 @@
     </div>
     {{!-- Owned Items Tab --}}
     <div class="tab items" data-group="primary" data-tab="items">
+
+      {{#if system.settings.firstEdition}}
       <!-- ARMOR -->
       <ol class="items-list" role="table">
         <li class="item flexrow item-header" role="rowgroup">
           <div class="item-image" role="cell"></div>
           <div class="skill-stat" style="flex-grow: 2.5;" role="cell">Armor Name</div>
-          {{#if armor.system.damageReduction}}
           <div class="skill-stat" role="cell">AP</div>
           <div class="skill-stat" role="cell">DR</div>
-          {{else}}
-          <div class="skill-stat" role="cell">Save Bonus</div>
-          {{/if}}
-		  <div class="skill-stat" role="cell">Speed</div>
-		  <div class="skill-stat" role="cell">Oxygen</div>
+		      <div class="skill-stat" role="cell">Speed</div>
+		      <div class="skill-stat" role="cell">Oxygen</div>
           <div class="skill-stat" role="cell">Equipped</div>
           <div class="item-controls" role="cell">
             <a class="item-control item-create" title="Create Armor" data-type="armor"><i class="fas fa-plus"></i> Add</a>
@@ -376,12 +374,9 @@
           <div class="item-image" role="cell"><img src="{{armor.img}}" title="{{armor.name}}" width="24" height="24" /></div>
           <h4 class="skill-name list-roll description-roll" style="flex-grow: 2.55;" role="cell">{{armor.name}}</h4>
           <div class="skill-stat" role="cell">{{armor.system.armorPoints}}</div>
-        {{#if armor.system.damageReduction}}
           <div class="skill-stat" role="cell">{{armor.system.damageReduction}}</div>
-        {{else}}
-        {{/if}}
-        <div class="skill-stat">{{armor.system.speed}}</div>
-        {{#if armor.system.oxygenMax}}
+          <div class="skill-stat">{{armor.system.speed}}</div>
+          {{#if armor.system.oxygenMax}}
           <div class="skill-stat" role="cell">{{armor.system.oxygenCurrent}}/{{armor.system.oxygenMax}}</div>
           {{else}}
           <div class="skill-stat" role="cell">N/A</div>
@@ -395,6 +390,42 @@
         </li>
         {{/each}}
       </ol>
+      {{else}}
+      <!-- ARMOR -->
+      <ol class="items-list" role="table">
+        <li class="item flexrow item-header" role="rowgroup">
+          <div class="item-image" role="cell"></div>
+          <div class="skill-stat" style="flex-grow: 2.5;" role="cell">Armor Name</div>
+          <div class="skill-stat" role="cell">Save Bonus</div>
+		      <div class="skill-stat" role="cell">Speed</div>
+		      <div class="skill-stat" role="cell">Oxygen</div>
+          <div class="skill-stat" role="cell">Equipped</div>
+          <div class="item-controls" role="cell">
+            <a class="item-control item-create" title="Create Armor" data-type="armor"><i class="fas fa-plus"></i> Add</a>
+          </div>
+        </li>
+        {{#each armors as |armor id|}}
+        <li class="item flexrow dropitem" data-item-id="{{armor._id}}" role="rowgroup">
+          <div class="item-image" role="cell"><img src="{{armor.img}}" title="{{armor.name}}" width="24" height="24" /></div>
+          <h4 class="skill-name list-roll description-roll" style="flex-grow: 2.55;" role="cell">{{armor.name}}</h4>
+          <div class="skill-stat" role="cell">{{armor.system.armorPoints}}</div>
+          <div class="skill-stat">{{armor.system.speed}}</div>
+          {{#if armor.system.oxygenMax}}
+          <div class="skill-stat" role="cell">{{armor.system.oxygenCurrent}}/{{armor.system.oxygenMax}}</div>
+          {{else}}
+          <div class="skill-stat" role="cell">N/A</div>
+          {{/if}}
+          <div class="skill-stat item-equip" role="cell"><input type="checkbox" name="armor.system.equipped" data-dtype="Boolean"
+              {{checked armor.system.equipped}} /></div>
+          <div class="item-controls" role="cell">
+            <a class="item-control item-edit" title="Edit Armor"><i class="fas fa-edit"></i></a>
+            <a class="item-control item-delete" title="Delete Armor"><i class="fas fa-trash"></i></a>
+          </div>
+        </li>
+        {{/each}}
+      </ol>
+      {{/if}}
+
       <!-- ITEMS -->
       <ol class="items-list">
         <li class="item flexrow item-header">