diff --git a/css/deltagreen.css b/css/deltagreen.css
index 9aed516..09cf6e2 100644
--- a/css/deltagreen.css
+++ b/css/deltagreen.css
@@ -1133,3 +1133,16 @@ input.item-sheet-short-input {
   min-height: 300px;
   resize: none;
 }
+
+.weapon-name-flexcontainer {
+  display: flex;
+  justify-content: flex-start;
+  flex-direction: row;
+  column-gap: 10px;
+}
+
+.weapon-name-flexitem {
+  flex: content;
+  align-self: flex-start;
+  text-align: left;
+}
diff --git a/module/actor/actor-sheet.js b/module/actor/actor-sheet.js
index 96c14a2..146e247 100644
--- a/module/actor/actor-sheet.js
+++ b/module/actor/actor-sheet.js
@@ -15,7 +15,7 @@ export default class DeltaGreenActorSheet extends ActorSheet {
     return foundry.utils.mergeObject(super.defaultOptions, {
       classes: ["deltagreen", "sheet", "actor"],
       template: "systems/deltagreen/templates/actor/actor-sheet.html",
-      width: 700,
+      width: 750,
       height: 770,
       tabs: [
         {
@@ -61,9 +61,9 @@ export default class DeltaGreenActorSheet extends ActorSheet {
     const data = super.getData();
 
     // Prepare items.
-    if (this.actor.type === "agent") {
-      this._prepareCharacterItems(data);
-    }
+    //if (this.actor.type === "agent") {
+    this._prepareCharacterItems(data);
+    //}
 
     // Make it easy for the sheet handlebars to understand how to sort the skills.
     data.sortSkillsSetting = game.settings.get("deltagreen", "sortSkills");
@@ -146,6 +146,7 @@ export default class DeltaGreenActorSheet extends ActorSheet {
     // Initialize containers.
     const armor = [];
     const weapons = [];
+    const gear = [];
 
     // Iterate through items, allocating to containers
     // let totalWeight = 0;
@@ -157,12 +158,27 @@ export default class DeltaGreenActorSheet extends ActorSheet {
       // Append to weapons.
       else if (i.type === "weapon") {
         weapons.push(i);
+      } else if (i.type === "gear") {
+        gear.push(i);
       }
     }
 
+    armor.sort(function (a, b) {
+      return a.sort - b.sort;
+    });
+
+    weapons.sort(function (a, b) {
+      return a.sort - b.sort;
+    });
+
+    gear.sort(function (a, b) {
+      return a.sort - b.sort;
+    });
+
     // Assign and return
     actorData.armor = armor;
     actorData.weapons = weapons;
+    actorData.gear = gear;
   }
 
   // Can add extra buttons to form header here if necessary
diff --git a/module/templates.js b/module/templates.js
index feb7415..bf9efc8 100644
--- a/module/templates.js
+++ b/module/templates.js
@@ -14,5 +14,6 @@ export default async function preloadHandlebarsTemplates() {
     "systems/deltagreen/templates/dialog/modify-percentile-roll.html",
     "systems/deltagreen/templates/actor/vehicle-sheet.html",
     "systems/deltagreen/templates/actor/help-and-licensing-partial.html",
+    "systems/deltagreen/templates/actor/equipment-partial.html",
   ]);
 }
diff --git a/templates/actor/actor-sheet.html b/templates/actor/actor-sheet.html
index c482281..21f8734 100644
--- a/templates/actor/actor-sheet.html
+++ b/templates/actor/actor-sheet.html
@@ -104,15 +104,18 @@
                     {{#unless skill.proficiency}}title="{{localize 'DG.Tooltip.CannotRollSkillLabel'}}"{{/unless}}
                   >
                   {{localizeWithFallback (concat "DG.Skills." key) skill.label }}
+                  <i class="fas fa-dice"></i>
                 </label>
                 
                 {{#if_eq key 'ritual' }}
+
                   {{#if (keepSanityPrivate)}}
                     <input class="percentile-skill-input" type="text" name="system.skills.{{key}}.proficiency" value="??" data-dtype="Number" {{#if skill.isCalculatedValue}} disabled {{/if}}/>
                     <input class="checkbox-skill-input" type="checkbox" name="system.skills.{{key}}.failure" {{checked skill.failure}} data-dtype="Boolean" {{#if skill.cannotBeImprovedByFailure}} disabled {{/if}} 
                       title="{{localize 'DG.Tooltip.SkillFailCheckbox'}}"
                       />
                   {{/if}}
+
                   {{#unless (keepSanityPrivate)}}
                     <input class="percentile-skill-input" type="text" name="system.skills.{{key}}.proficiency" value="{{skill.proficiency}}" data-dtype="Number" {{#if skill.isCalculatedValue}} disabled {{/if}}/>
                     <input class="checkbox-skill-input" type="checkbox" name="system.skills.{{key}}.failure" {{checked skill.failure}} data-dtype="Boolean" {{#if skill.cannotBeImprovedByFailure}} disabled {{/if}} 
@@ -121,12 +124,14 @@
                   {{/unless}}
                   
                 {{/if_eq}}
+
                 {{#if_not_eq key 'ritual' }}
                   <input class="percentile-skill-input" type="text" name="system.skills.{{key}}.proficiency" value="{{skill.proficiency}}" data-dtype="Number" {{#if skill.isCalculatedValue}} disabled {{/if}}/>
                   <input class="checkbox-skill-input" type="checkbox" name="system.skills.{{key}}.failure" {{checked skill.failure}} data-dtype="Boolean" {{#if skill.cannotBeImprovedByFailure}} disabled {{/if}} 
                     title="{{localize 'DG.Tooltip.SkillFailCheckbox'}}"
                     />
                 {{/if_not_eq}}
+
               </div>
             {{/each}}
           </div>
@@ -148,7 +153,7 @@
               <div class="flex-group-center flex-mid-border">
                 <div class="">
                   <div class="physical-stats-outer-grid-3col">
-                    <label class="rollable resource-label" data-rolltype="stat" data-key="{{key}}" title="{{localize 'DG.Tooltip.x5AttributeLabel'}}" for="system.statistics.{{key}}.value">{{localize (concat 'DG.Attributes.' key)}}</label>
+                    <label class="rollable resource-label" data-rolltype="stat" data-key="{{key}}" title="{{localize 'DG.Tooltip.x5AttributeLabel'}}" for="system.statistics.{{key}}.value">{{localize (concat 'DG.Attributes.' key)}}<i class="fas fa-dice"></i></label>
                     <input type="text" name="system.statistics.{{key}}.value" value="{{statistic.value}}" data-dtype="Number"/>
                     <span  class="rollable" data-rolltype="stat" data-key="{{key}}" title="{{localize 'DG.Tooltip.x5AttributeLabel'}}">({{numberFormat statistic.x5 decimals=0 sign=false}}%)</span>
                   </div >
@@ -283,167 +288,7 @@
 
         {{!-- GEAR Tab --}}
         <div class="tab items" data-group="primary" data-tab="gear">
-          <div>
-                        
-            <div class="horizontal-bar-section-divider">
-                <span>{{localize 'DG.Gear.Weapons'}}</span>                                                    
-            </div>
-
-            <ol class="items-list">
-              
-              <li class="item flexrow item-header">
-                <div class="item-image"></div>
-                <span class="">{{localize 'DG.Gear.Name'}} <a><i class="weapon-browse fas fa-search"></i></a></span>
-                <span class="centered-item-property">{{localize 'DG.Gear.DamageOrLethality'}}</span>
-                <span class="centered-item-property">{{localize 'DG.Gear.ArmorPiercing'}}</span>
-                <div class="item-controls">
-                  <a class="item-control item-create action-pill" title="Create item" data-type="weapon"><i class="fas fa-plus"></i> {{localize 'DG.Generic.AddButtonLabel'}}</a>                  
-                </div>
-              </li>
-
-              {{#each actor.items as |item id|}}
-                {{#if_eq item.type 'weapon'}}
-                  
-                  <li class="item flexrow" data-item-id="{{item._id}}">
-                    <div 
-                      class="flexrow rollable"
-                      data-iid="{{item._id}}"
-                      data-rolltype="weapon" 
-                      data-key="{{item.system.skill}}"                                          
-                      title="{{localize 'DG.Tooltip.SkillLabel'}} ({{localizeWeaponSkill item.system.skill}})"
-                    ><img class="item-image" src="{{item.img}}"  width="24" height="24"/>
-                    
-                    <h4 style="word-wrap: break-word;" class="item-name">
-                        {{item.name}}
-                    </h4>
-                    </div>
-
-                    <span class = "centered-item-property">
-                      {{#unless item.system.isLethal}}
-                        <span class="rollable" data-rolltype="damage" data-iid="{{item._id}}">                      
-                          {{toUpperCase item.system.damage}}{{#if_eq item.system.skill 'unarmed_combat'}}{{actor.system.statistics.str.meleeDamageBonusFormula}}{{/if_eq}}{{#if_eq item.system.skill 'melee_weapons'}}{{actor.system.statistics.str.meleeDamageBonusFormula}}{{/if_eq}}
-                        </span>
-                      {{/unless}}
-
-                      {{#if item.system.isLethal}}
-                      <span class="rollable" data-rolltype="lethality" data-iid="{{item._id}}"
-                        title="{{localize 'DG.ItemWindow.Weapons.LethalityTooltip'}}">
-                        {{item.system.lethality}}%</span>
-                      {{/if}}
-                      
-                      {{#if item.system.lethality}}
-                        - 
-                        {{#if item.system.isLethal}}
-                          <a class="item-control toggle-lethality dg-red" title="Toggle Lethality (Current Lethality: {{item.system.lethality}}%)"><i class="fas fa-skull-crossbones" item-id="{{item.id}}" is-lethal="true"></i></a>
-                        {{else}}
-                          <a class="item-control toggle-lethality" title="Toggle Lethality (Currently No Lethality)"><i class="fas fa-user-injured" item-id="{{item.id}}" is-lethal="false"></i></a>
-                        {{/if}}
-                      {{/if}}
-                    </span>
-
-                    <span class="centered-item-property">{{item.system.armorPiercing}}</span>
-
-                    <div class="item-controls">
-                        <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                        <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-                    </div>
-                    
-                  </li>
-
-                {{/if_eq}}
-              {{/each}}
-            </ol>
-          </div>
-          <div>
-
-            <div class="horizontal-bar-section-divider">
-              <span>{{localize 'DG.Gear.Armor'}}</span>
-            </div>
-
-            <ol class="items-list">
-              <li class="item flexrow item-header">
-                <div class="item-image"></div>
-                <div class="item-name"><span>{{localize 'DG.Gear.Name'}} <a><i class="armor-browse fas fa-search"></i></a></span></div>
-                <span class="centered-item-property">{{localize 'DG.Gear.ArmorRating'}}</span>
-                <span class="centered-item-property">{{localize 'DG.Gear.Equipped'}}</span>
-                <div class="item-controls">
-                  <a class="item-control item-create action-pill" title="Create item" data-type="armor"><i class="fas fa-plus"></i> {{localize 'DG.Generic.AddButtonLabel'}}</a>
-                </div>
-              </li>
-
-              {{#each actor.items as |item id|}}
-                {{#if_eq item.type 'armor'}}
-
-                  <li class="item flexrow" data-item-id="{{item.id}}">
-                    <div class="item-image"><img src="{{item.img}}" title="{{item.name}}" width="24" height="24"/></div>
-                    <h4 style="word-wrap: break-word;" class="item-name">{{item.name}}</h4>
-                    <span class="centered-item-property">{{item.system.protection}}</span>
-                    
-                    <span class="equipped-item centered-item-property" data-id="{{item.id}}" title="{{localize 'DG.Tooltip.ToggleEquippedState'}}">
-                      {{#if item.system.equipped}}
-                        <span class="fas fa-check"></span>
-                      {{else}}
-                        <span class="fas fa-times"></span>
-                      {{/if}}
-                    </span>
-
-                    <div class="item-controls">
-                        <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                        <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-                    </div>
-                  </li>
-
-                {{/if_eq}}
-              {{/each}}
-
-            </ol>
-          </div>
-          <div>
-
-            <div class="horizontal-bar-section-divider">
-              <span>{{localize 'DG.Gear.OtherGear'}}</span>
-            </div>
-
-            <ol class="items-list">
-              <li class="item flexrow item-header">
-                <div class="item-image"></div>
-                <div style="min-width: 55%;" class="item-name">{{localize 'DG.Gear.Name'}}</div>
-                
-                <span class="centered-item-property">{{localize 'DG.Gear.Equipped'}}</span>
-                <div class="item-controls">
-                  <a class="item-control item-create action-pill" title="Create item" data-type="gear"><i class="fas fa-plus"></i> {{localize 'DG.Generic.AddButtonLabel'}}</a>
-                </div>
-              </li>
-
-              {{#each actor.items as |item id|}}
-
-                {{#if_eq item.type 'gear'}}
-
-                  <li class="item flexrow" data-item-id="{{item.id}}">
-                    <div class="item-image"><img src="{{item.img}}" title="{{item.name}}" width="24" height="24"/></div>
-                    <h4 style="word-wrap: break-word; min-width: 55%;" class="item-name">{{item.name}}</h4>                    
-                    
-                    <span class="equipped-item centered-item-property" data-id="{{item.id}}" title="{{localize 'DG.Tooltip.ToggleEquippedState'}}" >
-                      
-                      {{#if item.system.equipped}}
-                        <span class="fas fa-check"></span>
-                      {{else}}
-                        <span class="fas fa-times"></span>
-                      {{/if}}
-                    
-                    </span>
-
-                    <div class="item-controls">
-                        <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                        <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-                    </div>
-                  </li>
-
-                {{/if_eq}}
-              {{/each}}
-
-            </ol>
-          </div>
+          {{> "systems/deltagreen/templates/actor/equipment-partial.html" }}
         </div>
 
         {{!-- PERSONAL (Biography) Tab --}}
diff --git a/templates/actor/custom-skills-partial.html b/templates/actor/custom-skills-partial.html
index f51eb43..10fbb52 100644
--- a/templates/actor/custom-skills-partial.html
+++ b/templates/actor/custom-skills-partial.html
@@ -6,6 +6,7 @@
   {{/if_eq}}
 </div>
 <div class="grid-2col">
+
   {{#each actor.system.typedSkills as |skill key|}}
     <div class="item flexrow flex-group-center flex-thin-border">
       <div class="flexrow">
@@ -14,6 +15,7 @@
             {{#unless skill.proficiency}}title="{{localize 'DG.Tooltip.CannotRollSkillLabel'}}"{{/unless}} 
           >
           {{skill.group}} ({{skill.label}})
+          <i class="fas fa-dice"></i>
         </label>
         <input class="percentile-skill-input" type="text" name="system.typedSkills.{{key}}.proficiency" value="{{skill.proficiency}}" data-dtype="Number"/>
         {{#if_eq ../actorType "agent"}}
@@ -26,10 +28,12 @@
       </div>
     </div>
   {{/each}}
+
   {{#each specialTraining as |training|}}
     <div class="item flexrow flex-group-center flex-thin-border special-training-box">
       <label class="{{if_gt training.targetNumber 0 'rollable' 'not-rollable'}}" data-key="{{training.key}}" data-name="{{training.name}}" data-rolltype="special-training">
         {{training.name}} ({{training.attribute}}, {{training.targetNumber}}%)
+        <i class="fas fa-dice"></i>
       </label>
       <div class="item-controls skill-and-training-controls">
           <a class="item-control special-training-action" data-action="Edit" data-id="{{training.id}}" title="Edit Training"><i class="fas fa-edit"></i></a>
@@ -37,4 +41,5 @@
       </div>
     </div>
   {{/each}}
+
 </div>
\ No newline at end of file
diff --git a/templates/actor/equipment-partial.html b/templates/actor/equipment-partial.html
new file mode 100644
index 0000000..9d8b137
--- /dev/null
+++ b/templates/actor/equipment-partial.html
@@ -0,0 +1,192 @@
+
+{{!-- WEAPONS/ATTACKS --}}
+<div>
+                        
+    <div class="horizontal-bar-section-divider">
+        <span>{{localize 'DG.Gear.Weapons'}}</span>                                                    
+    </div>
+
+    <ol class="items-list">
+      
+      <li class="item flexrow item-header">
+        <div class="item-image"></div>
+        <span class="">{{localize 'DG.Gear.Name'}} <a><i class="weapon-browse fas fa-search"></i></a></span>
+        <span class="centered-item-property">{{localize 'DG.Gear.DamageOrLethality'}}</span>
+        <span class="centered-item-property">{{localize 'DG.Gear.ArmorPiercing'}}</span>
+        <div class="item-controls">
+          <a class="item-control item-create action-pill" title="Create item" data-type="weapon"><i class="fas fa-plus"></i> {{localize 'DG.Generic.AddButtonLabel'}}</a>                  
+        </div>
+      </li>
+
+      {{#each actor.weapons as |item id|}}
+          
+        <li class="item flexrow" data-item-id="{{item._id}}">
+
+            <div class="flexrow">
+
+                <img class="item-image weapon-name-flexitem" src="{{item.img}}" width="24" height="24"/>                
+
+                <span class="">                    
+
+                    <h4 style="word-wrap: break-word; display: inline;" class="item-name">
+                        {{item.name}}
+                    </h4>
+
+                    <span class="rollable"
+                    data-iid="{{item._id}}"
+                    data-rolltype="weapon" 
+                    data-key="{{item.system.skill}}"                                          
+                    title="{{localize 'DG.Tooltip.SkillLabel'}} ({{localizeWeaponSkill item.system.skill}})">
+                        <i class="fas fa-dice"></i>
+                    </span>
+
+                </span>
+
+            </div>
+
+            <span class="centered-item-property">
+
+                {{#if item.system.lethality}}                
+                    {{#if item.system.isLethal}}
+                        <a class="item-control toggle-lethality dg-red" title="Toggle Lethality (Current Lethality: {{item.system.lethality}}%)"><i class="fas fa-skull-crossbones" item-id="{{item._id}}" is-lethal="true"></i></a>
+                    {{else}}
+                        <a class="item-control toggle-lethality" title="Toggle Lethality (Currently No Lethality)"><i class="fas fa-user-injured" item-id="{{item._id}}" is-lethal="false"></i></a>
+                    {{/if}}
+                {{/if}}
+
+                {{#unless item.system.isLethal}}
+                    <span class="rollable" data-rolltype="damage" data-iid="{{item._id}}">                      
+                        {{toUpperCase item.system.damage}}{{#if_eq item.system.skill 'unarmed_combat'}}{{actor.system.statistics.str.meleeDamageBonusFormula}}{{/if_eq}}{{#if_eq item.system.skill 'melee_weapons'}}{{actor.system.statistics.str.meleeDamageBonusFormula}}{{/if_eq}}
+                        <i class="fas fa-dice"></i>
+                    </span>
+                {{/unless}}
+
+                {{#if item.system.isLethal}}
+                    <span class="rollable" data-rolltype="lethality" data-iid="{{item._id}}" title="{{localize 'DG.ItemWindow.Weapons.LethalityTooltip'}}">
+                        {{item.system.lethality}}%
+                        <i class="fas fa-dice"></i>
+                    </span>                   
+                {{/if}}                                                
+
+            </span>
+
+            <span class="centered-item-property">{{item.system.armorPiercing}}</span>
+
+            <div class="item-controls">
+                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+            </div>
+        
+        </li>
+
+      {{/each}}
+
+    </ol>
+
+</div>
+
+{{!-- ARMOR/DEFENSE --}}
+<div>
+
+    <div class="horizontal-bar-section-divider">
+      <span>{{localize 'DG.Gear.Armor'}}</span>
+    </div>
+
+    <ol class="items-list">
+
+      <li class="item flexrow item-header">
+
+        <div class="item-image"></div>
+        <div class="item-name"><span>{{localize 'DG.Gear.Name'}} <a><i class="armor-browse fas fa-search"></i></a></span></div>
+        <span class="centered-item-property">{{localize 'DG.Gear.ArmorRating'}}</span>
+        <span class="centered-item-property">{{localize 'DG.Gear.Equipped'}}</span>
+        <div class="item-controls">
+          <a class="item-control item-create action-pill" title="Create item" data-type="armor"><i class="fas fa-plus"></i> {{localize 'DG.Generic.AddButtonLabel'}}</a>
+        </div>
+
+      </li>
+
+      {{#each actor.armor as |item id|}}
+
+        <li class="item flexrow" data-item-id="{{item._id}}">
+
+            <div class="item-image"><img src="{{item.img}}" title="{{item.name}}" width="24" height="24"/></div>
+
+            <h4 style="word-wrap: break-word;" class="item-name">{{item.name}}</h4>
+
+            <span class="centered-item-property">{{item.system.protection}}</span>
+            
+            <span class="equipped-item centered-item-property" data-id="{{item._id}}" title="{{localize 'DG.Tooltip.ToggleEquippedState'}}">
+                {{#if item.system.equipped}}
+                <span class="fas fa-check"></span>
+                {{else}}
+                <span class="fas fa-times"></span>
+                {{/if}}
+            </span>
+
+            <div class="item-controls">
+                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+            </div>
+
+        </li>
+
+      {{/each}}
+
+    </ol>
+</div>
+
+{{!-- OTHER GEAR/MISC --}}
+
+<div>
+
+    <div class="horizontal-bar-section-divider">
+      <span>{{localize 'DG.Gear.OtherGear'}}</span>
+    </div>
+
+    <ol class="items-list">
+
+      <li class="item flexrow item-header">
+
+        <div class="item-image"></div>
+
+        <div style="min-width: 55%;" class="item-name">{{localize 'DG.Gear.Name'}}</div>
+        
+        <span class="centered-item-property">{{localize 'DG.Gear.Equipped'}}</span>
+
+        <div class="item-controls">
+          <a class="item-control item-create action-pill" title="Create item" data-type="gear"><i class="fas fa-plus"></i> {{localize 'DG.Generic.AddButtonLabel'}}</a>
+        </div>
+
+      </li>
+
+      {{#each actor.gear as |item id|}}
+
+        <li class="item flexrow" data-item-id="{{item._id}}">
+
+            <div class="item-image"><img src="{{item.img}}" title="{{item.name}}" width="24" height="24"/></div>
+
+            <h4 style="word-wrap: break-word; min-width: 55%;" class="item-name">{{item.name}}</h4>                    
+            
+            <span class="equipped-item centered-item-property" data-id="{{item._id}}" title="{{localize 'DG.Tooltip.ToggleEquippedState'}}" >
+                
+                {{#if item.system.equipped}}
+                <span class="fas fa-check"></span>
+                {{else}}
+                <span class="fas fa-times"></span>
+                {{/if}}
+            
+            </span>
+
+            <div class="item-controls">
+                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+            </div>
+
+        </li>
+
+      {{/each}}
+
+    </ol>
+
+</div>
\ No newline at end of file
diff --git a/templates/actor/npc-sheet.html b/templates/actor/npc-sheet.html
index f0d1bd1..0a65a48 100644
--- a/templates/actor/npc-sheet.html
+++ b/templates/actor/npc-sheet.html
@@ -144,169 +144,7 @@
       
     {{!-- GEAR --}}
     <div class="tab items" data-group="primary" data-tab="gear">
-      <div>
-                    
-        <div class="horizontal-bar-section-divider">
-            <span>{{localize 'DG.Gear.Weapons'}}</span>                                                    
-        </div>
-
-        <ol class="items-list">
-          
-          <li class="item flexrow item-header">
-            <div class="item-image"></div>
-            <span class="">{{localize 'DG.Gear.Name'}}</span>
-            <span class="centered-item-property">{{localize 'DG.Gear.DamageOrLethality'}}</span>
-            <span class="centered-item-property">{{localize 'DG.Gear.ArmorPiercing'}}</span>
-            <div class="item-controls">
-              <a class="item-control item-create action-pill" title="Create item" data-type="weapon"><i class="fas fa-plus"></i> {{localize 'DG.Generic.AddButtonLabel'}}</a>
-            </div>
-          </li>
-
-          {{#each actor.items as |item id|}}
-            {{#if_eq item.type 'weapon'}}
-              
-              <li class="item flexrow" data-item-id="{{item.id}}">
-                <div class="item-image"><img src="{{item.img}}" title="{{item.name}}" width="24" height="24"/></div>
-                
-                <h4 style="word-wrap: break-word;" 
-                  class="item-name rollable" 
-                  data-rolltype="weapon"                  
-                  data-key="{{item.system.skill}}"
-                  data-iid="{{item._id}}"
-                  title="{{localize 'DG.Tooltip.SkillLabel'}} ({{localizeWeaponSkill item.system.skill}})"
-                  >
-                    {{item.name}}
-                </h4>
-
-                <span class="centered-item-property">
-                  {{#unless item.system.isLethal}}
-                    <span class="rollable" data-rolltype="damage" data-iid="{{item._id}}">                      
-                      {{toUpperCase item.system.damage}}
-                    </span>
-                  {{/unless}}
-
-                  {{#if item.system.isLethal}}
-                    <span class="rollable" data-rolltype="lethality" data-label="{{item.name}}" data-iid="{{item._id}}"
-                      title="{{localize 'DG.ItemWindow.Weapons.LethalityTooltip'}}"
-                      >{{formatLethality item.system.lethality}}</span>
-                  {{/if}}
-
-                  {{#if item.system.lethality}}
-                    - 
-                    {{#if item.system.isLethal}}
-                      <a class="item-control toggle-lethality dg-red" title="Toggle Lethality (Current Lethality: {{item.system.lethality}}%)"><i class="fas fa-skull-crossbones" item-id="{{item.id}}" is-lethal="true"></i></a>
-                    {{else}}
-                      <a class="item-control toggle-lethality" title="Toggle Lethality (Currently No Lethality)"><i class="fas fa-user-injured" item-id="{{item.id}}" is-lethal="false"></i></a>
-                    {{/if}}
-                  {{/if}}
-                </span>
-
-
-                <span class="centered-item-property">{{item.system.armorPiercing}}</span>
-
-                <div class="item-controls">
-                    <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                    <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-                </div>
-                
-              </li>
-
-            {{/if_eq}}
-          {{/each}}
-        </ol>
-      </div>
-      <div>
-
-        <div class="horizontal-bar-section-divider">
-          <span>{{localize 'DG.Gear.Armor'}}</span>
-        </div>
-
-        <ol class="items-list">
-          <li class="item flexrow item-header">
-            <div class="item-image"></div>
-            <div class="item-name">{{localize 'DG.Gear.Name'}}</div>
-            <span class="centered-item-property">{{localize 'DG.Gear.ArmorRating'}}</span>
-            <span class="centered-item-property">{{localize 'DG.Gear.Equipped'}}</span>
-            <div class="item-controls">
-              <a class="item-control item-create action-pill" title="Create item" data-type="armor"><i class="fas fa-plus"></i> {{localize 'DG.Generic.AddButtonLabel'}}</a>
-            </div>
-          </li>
-
-          {{#each actor.items as |item id|}}
-            {{#if_eq item.type 'armor'}}
-
-              <li class="item flexrow" data-item-id="{{item.id}}">
-                <div class="item-image"><img src="{{item.img}}" title="{{item.name}}" width="24" height="24"/></div>
-                <h4 style="word-wrap: break-word;" class="item-name">{{item.name}}</h4>
-                <span class="centered-item-property">{{item.system.protection}}</span>
-                
-                <span class="equipped-item centered-item-property" data-id="{{item.id}}" title="{{localize 'DG.Tooltip.ToggleEquippedState'}}">
-                  {{#if item.system.equipped}}
-                    <span class="fas fa-check"></span>
-                  {{else}}
-                    <span class="fas fa-times"></span>
-                  {{/if}}
-                </span>
-
-                <div class="item-controls">
-                    <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                    <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-                </div>
-              </li>
-
-            {{/if_eq}}
-          {{/each}}
-
-        </ol>
-      </div>
-      <div>
-
-        <div class="horizontal-bar-section-divider">
-          <span>{{localize 'DG.Gear.OtherGear'}}</span>
-        </div>
-
-        <ol class="items-list">
-          <li class="item flexrow item-header">
-            <div class="item-image"></div>
-            <div class="item-name">{{localize 'DG.Gear.Name'}}</div>
-            <div class="item-name"></div>
-            <span class="centered-item-property">{{localize 'DG.Gear.Equipped'}}</span>
-            <div class="item-controls">
-              <a class="item-control item-create action-pill" title="Create item" data-type="gear"><i class="fas fa-plus"></i> {{localize 'DG.Generic.AddButtonLabel'}}</a>
-            </div>
-          </li>
-
-          {{#each actor.items as |item id|}}
-            {{#if_eq item.type 'gear'}}
-
-              <li class="item flexrow" data-item-id="{{item.id}}">
-                <div class="item-image"><img src="{{item.img}}" title="{{item.name}}" width="24" height="24"/></div>
-                
-                <h4 style="word-wrap: break-word;" class="item-name">{{item.name}}</h4>
-
-                <span></span> <!-- This is just here to get things to align nicely with the other sections-->
-                
-                <span class="equipped-item centered-item-property" data-id="{{item.id}}" title="{{localize 'DG.Tooltip.ToggleEquippedState'}}" >
-                  
-                  {{#if item.system.equipped}}
-                    <span class="fas fa-check"></span>
-                  {{else}}
-                    <span class="fas fa-times"></span>
-                  {{/if}}
-                
-                </span>
-
-                <div class="item-controls">
-                    <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                    <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-                </div>
-              </li>
-
-            {{/if_eq}}
-          {{/each}}
-
-        </ol>
-      </div>
+      {{> "systems/deltagreen/templates/actor/equipment-partial.html" }}
     </div>
 
       {{!-- About Tab --}}
diff --git a/templates/actor/unnatural-sheet.html b/templates/actor/unnatural-sheet.html
index b218063..c13ef57 100644
--- a/templates/actor/unnatural-sheet.html
+++ b/templates/actor/unnatural-sheet.html
@@ -137,168 +137,7 @@
       
     {{!-- GEAR --}}
     <div class="tab items" data-group="primary" data-tab="gear">
-      <div>
-                    
-        <div class="horizontal-bar-section-divider">
-            <span>{{localize 'DG.Gear.Weapons'}}</span>                                                    
-        </div>
-
-        <ol class="items-list">
-          
-          <li class="item flexrow item-header">
-            <div class="item-image"></div>
-            <span class="">{{localize 'DG.Gear.Name'}}</span>
-            <span class="centered-item-property">{{localize 'DG.Gear.DamageOrLethality'}}</span>
-            <span class="centered-item-property">{{localize 'DG.Gear.ArmorPiercing'}}</span>
-            <div class="item-controls">
-              <a class="item-control item-create action-pill" title="Create item" data-type="weapon"><i class="fas fa-plus"></i> {{localize 'DG.Generic.AddButtonLabel'}}</a>
-            </div>
-          </li>
-
-          {{#each actor.items as |item id|}}
-            {{#if_eq item.type 'weapon'}}
-              
-              <li class="item flexrow" data-item-id="{{item.id}}">
-                <div class="item-image"><img src="{{item.img}}" title="{{item.name}}" width="24" height="24"/></div>
-                
-                <h4 style="word-wrap: break-word;" 
-                  class="item-name rollable" 
-                  data-rolltype="weapon" 
-                  data-key="{{item.system.skill}}"
-                  data-iid="{{item._id}}"
-                  title="{{localize 'DG.Tooltip.SkillLabel'}} ({{localizeWeaponSkill item.system.skill}})"
-                  >
-                    {{item.name}}
-                </h4>
-
-                <span class="centered-item-property">
-                  {{#unless item.system.isLethal}}
-                    <span class="rollable" data-rolltype="damage" data-iid="{{item._id}}">                      
-                      {{toUpperCase item.system.damage}}
-                    </span>
-                  {{/unless}}
-
-                  {{#if item.system.isLethal}}
-                  <span class="rollable" data-rolltype="lethality" data-iid="{{item._id}}"
-                    title="{{localize 'DG.ItemWindow.Weapons.LethalityTooltip'}}"
-                    >{{formatLethality item.system.lethality}}</span>
-                  {{/if}}
-
-                  {{#if item.system.lethality}}
-                    - 
-                    {{#if item.system.isLethal}}
-                      <a class="item-control toggle-lethality dg-red" title="Toggle Lethality (Current Lethality: {{item.system.lethality}}%)"><i class="fas fa-skull-crossbones" item-id="{{item.id}}" is-lethal="true"></i></a>
-                    {{else}}
-                      <a class="item-control toggle-lethality" title="Toggle Lethality (Currently No Lethality)"><i class="fas fa-user-injured" item-id="{{item.id}}" is-lethal="false"></i></a>
-                    {{/if}}
-                  {{/if}}
-                </span>
-
-                <span class="centered-item-property">{{item.system.armorPiercing}}</span>
-
-                <div class="item-controls">
-                    <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                    <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-                </div>
-                
-              </li>
-
-            {{/if_eq}}
-          {{/each}}
-        </ol>
-      </div>
-      <div>
-
-        <div class="horizontal-bar-section-divider">
-          <span>{{localize 'DG.Gear.Armor'}}</span>
-        </div>
-
-        <ol class="items-list">
-          <li class="item flexrow item-header">
-            <div class="item-image"></div>
-            <div class="item-name">{{localize 'DG.Gear.Name'}}</div>
-            <span class="centered-item-property">{{localize 'DG.Gear.ArmorRating'}}</span>
-            <span class="centered-item-property">{{localize 'DG.Gear.Equipped'}}</span>
-            <div class="item-controls">
-              <a class="item-control item-create action-pill" title="Create item" data-type="armor"><i class="fas fa-plus"></i> {{localize 'DG.Generic.AddButtonLabel'}}</a>
-            </div>
-          </li>
-
-          {{#each actor.items as |item id|}}
-            {{#if_eq item.type 'armor'}}
-
-              <li class="item flexrow" data-item-id="{{item.id}}">
-                <div class="item-image"><img src="{{item.img}}" title="{{item.name}}" width="24" height="24"/></div>
-                <h4 style="word-wrap: break-word;" class="item-name">{{item.name}}</h4>
-                <span class="centered-item-property">{{item.system.protection}}</span>
-                
-                <span class="equipped-item centered-item-property" data-id="{{item.id}}" title="{{localize 'DG.Tooltip.ToggleEquippedState'}}">
-                  {{#if item.system.equipped}}
-                    <span class="fas fa-check"></span>
-                  {{else}}
-                    <span class="fas fa-times"></span>
-                  {{/if}}
-                </span>
-
-                <div class="item-controls">
-                    <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                    <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-                </div>
-              </li>
-
-            {{/if_eq}}
-          {{/each}}
-
-        </ol>
-      </div>
-      <div>
-
-        <div class="horizontal-bar-section-divider">
-          <span>{{localize 'DG.Gear.OtherGear'}}</span>
-        </div>
-
-        <ol class="items-list">
-          <li class="item flexrow item-header">
-            <div class="item-image"></div>
-            <div class="item-name">{{localize 'DG.Gear.Name'}}</div>
-            <div class="item-name"></div>
-            <span class="centered-item-property">{{localize 'DG.Gear.Equipped'}}</span>
-            <div class="item-controls">
-              <a class="item-control item-create action-pill" title="Create item" data-type="gear"><i class="fas fa-plus"></i> {{localize 'DG.Generic.AddButtonLabel'}}</a>
-            </div>
-          </li>
-
-          {{#each actor.items as |item id|}}
-            {{#if_eq item.type 'gear'}}
-
-              <li class="item flexrow" data-item-id="{{item.id}}">
-                <div class="item-image"><img src="{{item.img}}" title="{{item.name}}" width="24" height="24"/></div>
-                
-                <h4 style="word-wrap: break-word;" class="item-name">{{item.name}}</h4>
-
-                <span></span> <!-- This is just here to get things to align nicely with the other sections-->
-                
-                <span class="equipped-item centered-item-property" data-id="{{item.id}}" title="{{localize 'DG.Tooltip.ToggleEquippedState'}}" >
-                  
-                  {{#if item.system.equipped}}
-                    <span class="fas fa-check"></span>
-                  {{else}}
-                    <span class="fas fa-times"></span>
-                  {{/if}}
-                
-                </span>
-
-                <div class="item-controls">
-                    <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                    <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-                </div>
-              </li>
-
-            {{/if_eq}}
-          {{/each}}
-
-        </ol>
-      </div>
+      {{> "systems/deltagreen/templates/actor/equipment-partial.html" }}
     </div>
 
       {{!-- About Tab --}}