diff --git a/module/templates.js b/module/templates.js
index 33c6e19..7baa2eb 100644
--- a/module/templates.js
+++ b/module/templates.js
@@ -12,6 +12,7 @@ export default async function preloadHandlebarsTemplates() {
     "systems/deltagreen/templates/actor/unnatural-sheet.html",
     "systems/deltagreen/templates/actor/npc-sheet.html",
     "systems/deltagreen/templates/actor/cv-partial.html",
+    "systems/deltagreen/templates/actor/custom-skills-partial.html",
     "systems/deltagreen/templates/dialog/modify-percentile-roll.html",
     "systems/deltagreen/templates/actor/vehicle-sheet.html",
     "systems/deltagreen/templates/actor/help-and-licensing-partial.html",
diff --git a/templates/actor/actor-sheet.html b/templates/actor/actor-sheet.html
index 8cbe60a..ec3ffb8 100644
--- a/templates/actor/actor-sheet.html
+++ b/templates/actor/actor-sheet.html
@@ -137,41 +137,9 @@
               {{/each}}
           </div>
 
+          {{!-- Custom Skills and Special Training --}}
           <div>
-            <div class="item-controls skill-util-buttons">
-              <a class="item-control typed-skill-add"><i class="fas fa-plus"></i>{{localize 'DG.Skills.AddTypedOrCustomSkill'}}</a>
-              <a class="item-control special-training-add"><i class="fas fa-plus"></i>{{localize 'Add Special Training'}}</a> 
-              <a class="item-control apply-skill-improvements">{{localize 'DG.Skills.ApplySkillImprovements'}}<i class="fas fa-dice"></i></a>
-            </div>
-            <div class="grid-2col">
-              {{#each actor.system.typedSkills as |skill key|}}
-                <div class="item flexrow flex-group-center flex-thin-border">
-                  <label class="{{if_gt skill.proficiency 0 'rollable' 'not-rollable'}} skill-label" data-key="{{key}}" data-rolltype="skill" data-roll="d100" data-target="{{skill.proficiency}}" data-label="{{skill.label}}" 
-                      {{#if skill.proficiency}}title="{{localize 'DG.Tooltip.SkillLabel'}}"{{/if}}
-                      {{#unless skill.proficiency}}title="{{localize 'DG.Tooltip.CannotRollSkillLabel'}}"{{/unless}} 
-                    >
-                    {{skill.group}} ({{skill.label}})
-                  </label>
-                  <input class="percentile-skill-input" type="text" name="system.typedSkills.{{key}}.proficiency" value="{{skill.proficiency}}" data-dtype="Number"/>
-                  <input type="checkbox" name="system.typedSkills.{{key}}.failure" {{checked skill.failure}} data-dtype="Boolean" {{#if skill.cannotBeImprovedByFailure}} disabled {{/if}} />
-                  <div class="item-controls">
-                      <a class="item-control typed-skill-edit" title="Edit Skill"><i class="fas fa-edit" data-typedskill="{{key}}" ></i></a>
-                      <a class="item-control typed-skill-delete" title="Delete Skill"><i class="fas fa-trash" data-typedskill="{{key}}" ></i></a>
-                  </div>
-                </div>
-              {{/each}}
-              {{#each actor.system.specialTraining as |training|}}
-                <div class="item flexrow flex-group-center flex-thin-border">
-                  <label class="">
-                    {{training.name}}
-                  </label>
-                  <div class="item-controls">
-                      <a class="item-control typed-skill-edit" title="Edit Skill"><i class="fas fa-edit" data-typedskill="{{key}}" ></i></a>
-                      <a class="item-control typed-skill-delete" title="Delete Skill"><i class="fas fa-trash" data-typedskill="{{key}}" ></i></a>
-                  </div>
-                </div>
-              {{/each}}
-            </div>
+            {{> "systems/deltagreen/templates/actor/custom-skills-partial.html" actorType="agent"}}
           </div>
         </div>
 
diff --git a/templates/actor/custom-skills-partial.html b/templates/actor/custom-skills-partial.html
new file mode 100644
index 0000000..1613c83
--- /dev/null
+++ b/templates/actor/custom-skills-partial.html
@@ -0,0 +1,36 @@
+<div class="item-controls skill-util-buttons">
+  <a class="item-control typed-skill-add"><i class="fas fa-plus"></i>{{localize 'DG.Skills.AddTypedOrCustomSkill'}}</a>
+  <a class="item-control special-training-add"><i class="fas fa-plus"></i>{{localize 'Add Special Training'}}</a> 
+  {{#if_eq actorType "agent"}}
+    <a class="item-control apply-skill-improvements">{{localize 'DG.Skills.ApplySkillImprovements'}}<i class="fas fa-dice"></i></a>
+  {{/if_eq}}
+</div>
+<div class="grid-2col">
+  {{#each actor.system.typedSkills as |skill key|}}
+    <div class="item flexrow flex-group-center flex-thin-border">
+      <label class="{{if_gt skill.proficiency 0 'rollable' 'not-rollable'}} skill-label" data-key="{{key}}" data-rolltype="skill" data-roll="d100" data-target="{{skill.proficiency}}" data-label="{{skill.label}}" 
+          {{#if skill.proficiency}}title="{{localize 'DG.Tooltip.SkillLabel'}}"{{/if}}
+          {{#unless skill.proficiency}}title="{{localize 'DG.Tooltip.CannotRollSkillLabel'}}"{{/unless}} 
+        >
+        {{skill.group}} ({{skill.label}})
+      </label>
+      <input class="percentile-skill-input" type="text" name="system.typedSkills.{{key}}.proficiency" value="{{skill.proficiency}}" data-dtype="Number"/>
+      <input type="checkbox" name="system.typedSkills.{{key}}.failure" {{checked skill.failure}} data-dtype="Boolean" {{#if skill.cannotBeImprovedByFailure}} disabled {{/if}} />
+      <div class="item-controls">
+          <a class="item-control typed-skill-edit" title="Edit Skill"><i class="fas fa-edit" data-typedskill="{{key}}" ></i></a>
+          <a class="item-control typed-skill-delete" title="Delete Skill"><i class="fas fa-trash" data-typedskill="{{key}}" ></i></a>
+      </div>
+    </div>
+  {{/each}}
+  {{#each actor.system.specialTraining as |training|}}
+    <div class="item flexrow flex-group-center flex-thin-border">
+      <label class="">
+        {{training.name}}
+      </label>
+      <div class="item-controls">
+          <a class="item-control typed-skill-edit" title="Edit Skill"><i class="fas fa-edit" data-typedskill="{{key}}" ></i></a>
+          <a class="item-control typed-skill-delete" title="Delete Skill"><i class="fas fa-trash" data-typedskill="{{key}}" ></i></a>
+      </div>
+    </div>
+  {{/each}}
+</div>
\ No newline at end of file
diff --git a/templates/actor/npc-sheet.html b/templates/actor/npc-sheet.html
index 427db2f..081c60e 100644
--- a/templates/actor/npc-sheet.html
+++ b/templates/actor/npc-sheet.html
@@ -128,41 +128,7 @@
       </div>
       <br>
       <div>
-        <div class="item-controls skill-util-buttons">
-          <a class="item-control typed-skill-add"><i class="fas fa-plus"></i>{{localize 'DG.Skills.AddTypedOrCustomSkill'}}</a>
-          <a class="item-control special-training-add"><i class="fas fa-plus"></i>{{localize 'Add Special Training'}}</a> 
-        </div>
-        <div class="grid-2col">
-          {{#each actor.system.typedSkills as |skill key|}}
-            {{#if (hideSkillBasedOnProficiencyAndUserChoice ../actor.system.showUntrainedSkills skill.proficiency)}}
-            <div class="item flexrow flex-group-center flex-thin-border">
-              <label class="{{if_gt skill.proficiency 0 'rollable' 'not-rollable'}} skill-label" data-rolltype="skill" data-roll="d100" data-target="{{skill.proficiency}}" data-key="{{key}}" 
-                  {{#if skill.proficiency}}title="{{localize 'DG.Tooltip.SkillLabel'}}"{{/if}}
-                  {{#unless skill.proficiency}}title="{{localize 'DG.Tooltip.CannotRollSkillLabel'}}"{{/unless}} 
-                >
-                {{skill.group}} ({{skill.label}})
-              </label>
-              <input class="percentile-skill-input" type="text" name="system.typedSkills.{{key}}.proficiency" value="{{skill.proficiency}}" data-dtype="Number"/>
-              
-              <div class="item-controls">
-                  <a class="item-control typed-skill-edit" title="Edit Skill"><i class="fas fa-edit" data-typedskill="{{key}}" ></i></a>
-                  <a class="item-control typed-skill-delete" title="Delete Skill"><i class="fas fa-trash" data-typedskill="{{key}}" ></i></a>
-              </div>
-            </div>
-            {{/if}}
-          {{/each}}
-          {{#each actor.system.specialTraining as |training|}}
-            <div class="item flexrow flex-group-center flex-thin-border">
-              <label class="">
-                {{training.name}}
-              </label>
-              <div class="item-controls">
-                  <a class="item-control typed-skill-edit" title="Edit Skill"><i class="fas fa-edit" data-typedskill="{{key}}" ></i></a>
-                  <a class="item-control typed-skill-delete" title="Delete Skill"><i class="fas fa-trash" data-typedskill="{{key}}" ></i></a>
-              </div>
-            </div>
-          {{/each}}
-        </div>
+        {{> "systems/deltagreen/templates/actor/custom-skills-partial.html"}}
       </div>
       <br>
       <div>
diff --git a/templates/actor/unnatural-sheet.html b/templates/actor/unnatural-sheet.html
index b5b3b9f..99ca73f 100644
--- a/templates/actor/unnatural-sheet.html
+++ b/templates/actor/unnatural-sheet.html
@@ -121,41 +121,7 @@
       </div>
       <br>
       <div>
-        <div class="item-controls skill-util-buttons">
-          <a class="item-control typed-skill-add"><i class="fas fa-plus"></i>{{localize 'DG.Skills.AddTypedOrCustomSkill'}}</a>
-          <a class="item-control special-training-add"><i class="fas fa-plus"></i>{{localize 'Add Special Training'}}</a> 
-        </div>
-        <div class="grid-2col">
-          {{#each actor.system.typedSkills as |skill key|}}
-            {{#if (hideSkillBasedOnProficiencyAndUserChoice ../actor.system.showUntrainedSkills skill.proficiency)}}
-            <div class="item flexrow flex-group-center flex-thin-border">
-              <label class="{{if_gt skill.proficiency 0 'rollable' 'not-rollable'}} skill-label" data-rolltype="skill" data-key="{{key}}" 
-                  {{#if skill.proficiency}}title="{{localize 'DG.Tooltip.SkillLabel'}}"{{/if}}
-                  {{#unless skill.proficiency}}title="{{localize 'DG.Tooltip.CannotRollSkillLabel'}}"{{/unless}} 
-                >
-                {{skill.group}} ({{skill.label}})
-              </label>
-              <input class="percentile-skill-input" type="text" name="system.typedSkills.{{key}}.proficiency" value="{{skill.proficiency}}" data-dtype="Number"/>
-              
-              <div class="item-controls">
-                  <a class="item-control typed-skill-edit" title="Edit Skill"><i class="fas fa-edit" data-typedskill="{{key}}" ></i></a>
-                  <a class="item-control typed-skill-delete" title="Delete Skill"><i class="fas fa-trash" data-typedskill="{{key}}" ></i></a>
-              </div>
-            </div>
-            {{/if}}
-          {{/each}}
-          {{#each actor.system.specialTraining as |training|}}
-            <div class="item flexrow flex-group-center flex-thin-border">
-              <label class="">
-                {{training.name}}
-              </label>
-              <div class="item-controls">
-                  <a class="item-control typed-skill-edit" title="Edit Skill"><i class="fas fa-edit" data-typedskill="{{key}}" ></i></a>
-                  <a class="item-control typed-skill-delete" title="Delete Skill"><i class="fas fa-trash" data-typedskill="{{key}}" ></i></a>
-              </div>
-            </div>
-          {{/each}}
-        </div>
+        {{> "systems/deltagreen/templates/actor/custom-skills-partial.html"}}
       </div>
       <br>
       <div>