diff --git a/templates/actor/actor-sheet.html b/templates/actor/actor-sheet.html
index d4694ab..08dd841 100644
--- a/templates/actor/actor-sheet.html
+++ b/templates/actor/actor-sheet.html
@@ -13,7 +13,7 @@
               <h1 class="charname"><input name="name" type="text" value="{{actor.name}}" title="{{localize 'DG.AgentNameFieldTooltip' }}"/></h1>
             </div>
             <div class="">
-              <h2 class="profession"><input name="data.biography.profession" type="text" value="{{actor.data.data.biography.profession}}" placeholder="{{localize 'DG.FallbackText.ProfessionAndOrRank'}}"/></h1>
+              <h2 class="profession"><input name="system.biography.profession" type="text" value="{{actor.system.biography.profession}}" placeholder="{{localize 'DG.FallbackText.ProfessionAndOrRank'}}"/></h1>
             </div>
           </div>
         </div>
@@ -22,51 +22,51 @@
           
           {{!-- HP --}}
           <div class="resource-outer-grid-1col">
-              <label for="actor.data.data.health.value" class="resource-label" title="{{localize 'DG.Tooltip.HP'}}">{{localize 'DG.Attributes.HP' }} (<span>{{actor.data.data.health.protection}} <i class="fas fa-shield-alt"></i></span>)</label>
+              <label for="actor.system.health.value" class="resource-label" title="{{localize 'DG.Tooltip.HP'}}">{{localize 'DG.Attributes.HP' }} (<span>{{actor.system.health.protection}} <i class="fas fa-shield-alt"></i></span>)</label>
               <div class="resource-inner-grid-3col">
-                <input type="text" name="data.health.value" value="{{actor.data.data.health.value}}" data-dtype="Number"/>
+                <input type="text" name="system.health.value" value="{{actor.system.health.value}}" data-dtype="Number"/>
                 <span> / </span>
-                <!-- <span title="{{localize 'DG.Tooltip.MaximumHP'}}" class="max-attribute-value-label">{{numberFormat data.health.max decimals=0 sign=false}}</span> -->
+                <!-- <span title="{{localize 'DG.Tooltip.MaximumHP'}}" class="max-attribute-value-label">{{numberFormat system.health.max decimals=0 sign=false}}</span> -->
                 <div class="max-resource-value" title="{{localize 'DG.Tooltip.MaximumHP'}}">
-                  <div>{{numberFormat actor.data.data.health.max decimals=0 sign=false}}</div>
+                  <div>{{numberFormat actor.system.health.max decimals=0 sign=false}}</div>
                 </div>
               </div>
           </div>
 
           {{!-- WP --}}
           <div class="resource-outer-grid-1col">
-              <label for="data.wp.value" class="resource-label" title="{{localize 'DG.Tooltip.WP'}}">{{localize 'DG.Attributes.WP' }}</label>
+              <label for="system.wp.value" class="resource-label" title="{{localize 'DG.Tooltip.WP'}}">{{localize 'DG.Attributes.WP' }}</label>
               <div class="resource-inner-grid-3col">
-                <input type="text" name="data.wp.value" value="{{actor.data.data.wp.value}}" data-dtype="Number"/>
+                <input type="text" name="system.wp.value" value="{{actor.system.wp.value}}" data-dtype="Number"/>
                 <span> / </span>
-                <!-- <span class="max-attribute-value-label" title="{{localize 'DG.Tooltip.MaximumWP'}}">{{numberFormat data.wp.max decimals=0 sign=false}}</span> -->
+                <!-- <span class="max-attribute-value-label" title="{{localize 'DG.Tooltip.MaximumWP'}}">{{numberFormat system.wp.max decimals=0 sign=false}}</span> -->
                 <div class="max-resource-value" title="{{localize 'DG.Tooltip.MaximumWP'}}">
-                  <div>{{numberFormat actor.data.data.wp.max decimals=0 sign=false}}</div>
+                  <div>{{numberFormat actor.system.wp.max decimals=0 sign=false}}</div>
                 </div>
               </div>
           </div>
 
           {{!-- Sanity --}}
           <div class="resource-outer-grid-1col">
-              <label for="data.san.value" class="resource-label rollable"
+              <label for="system.san.value" class="resource-label rollable"
                 data-rolltype="sanity" data-roll="d100" data-target="sanity" data-label="SAN" title="{{localize 'DG.Tooltip.SanityLabel'}}"
               >{{localize 'DG.Attributes.SAN' }} <i class="fas fa-dice"></i></label>
               <div class="resource-inner-grid-3col">
 
                 {{#if (keepSanityPrivate)}}
-                  <input type="text" value="??" disabled title="{{localize 'DG.Tooltip.CurrentSanityPartOne'}}{{data.sanity.currentBreakingPoint}}{{localize 'DG.Tooltip.CurrentSanityPartTwo'}}" />
+                  <input type="text" value="??" disabled title="{{localize 'DG.Tooltip.CurrentSanityPartOne'}}{{system.sanity.currentBreakingPoint}}{{localize 'DG.Tooltip.CurrentSanityPartTwo'}}" />
                   <span> / </span>
                   <div class="max-resource-value" title="{{localize 'DG.Tooltip.MaximumSanity'}}">
-                    <div>{{numberFormat actor.data.data.sanity.max decimals=0 sign=false}}</div>
+                    <div>{{numberFormat actor.system.sanity.max decimals=0 sign=false}}</div>
                   </div>
                 {{/if}}
 
                 {{#unless (keepSanityPrivate)}}
  
-                  <input type="text" name="data.sanity.value" value="{{actor.data.data.sanity.value}}" data-dtype="Number" title="{{localize 'DG.Tooltip.CurrentSanityPartOne'}}{{data.sanity.currentBreakingPoint}}{{localize 'DG.Tooltip.CurrentSanityPartTwo'}}" />
+                  <input type="text" name="system.sanity.value" value="{{actor.system.sanity.value}}" data-dtype="Number" title="{{localize 'DG.Tooltip.CurrentSanityPartOne'}}{{system.sanity.currentBreakingPoint}}{{localize 'DG.Tooltip.CurrentSanityPartTwo'}}" />
                   <span> / </span>
                   <div class="max-resource-value" title="{{localize 'DG.Tooltip.MaximumSanity'}}">
-                    <div>{{numberFormat actor.data.data.sanity.max decimals=0 sign=false}}</div>
+                    <div>{{numberFormat actor.system.sanity.max decimals=0 sign=false}}</div>
                   </div>
 
                 {{/unless}}
@@ -94,10 +94,10 @@
         <div class="tab skills" data-group="primary" data-tab="skills">
             <div class="grid grid-3col">
 
-              {{#each actor.data.data.skills as |skill key|}}
+              {{#each actor.system.skills as |skill key|}}
 
                 <div class="flexrow flex-group-center">
-                  <label class="{{if_gt skill.proficiency 0 'rollable' 'not-rollable'}} skill-label" data-rolltype="skill" data-roll="d100" data-target="{{skill.proficiency}}" data-label="{{localize (concat 'DG.Skills.' key)}}" for="data.skills.{{key}}.value" 
+                  <label class="{{if_gt skill.proficiency 0 'rollable' 'not-rollable'}} skill-label" data-rolltype="skill" data-roll="d100" data-target="{{skill.proficiency}}" data-label="{{localize (concat 'DG.Skills.' key)}}" for="system.skills.{{key}}.value" 
                       {{#if skill.proficiency}}title="{{localize 'DG.Tooltip.SkillLabel'}}"{{/if}}
                       {{#unless skill.proficiency}}title="{{localize 'DG.Tooltip.CannotRollSkillLabel'}}"{{/unless}}
                     >
@@ -107,15 +107,15 @@
                   {{#if_eq key 'ritual' }}
 
                     {{#if (keepSanityPrivate)}}
-                      <input class="percentile-skill-input" type="text" name="data.skills.{{key}}.proficiency" value="??" data-dtype="Number" {{#if skill.isCalculatedValue}} disabled {{/if}}/>
-                      <input type="checkbox" name="data.skills.{{key}}.failure" {{checked skill.failure}} data-dtype="Boolean" {{#if skill.cannotBeImprovedByFailure}} disabled {{/if}} 
+                      <input class="percentile-skill-input" type="text" name="system.skills.{{key}}.proficiency" value="??" data-dtype="Number" {{#if skill.isCalculatedValue}} disabled {{/if}}/>
+                      <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="data.skills.{{key}}.proficiency" value="{{skill.proficiency}}" data-dtype="Number" {{#if skill.isCalculatedValue}} disabled {{/if}}/>
-                      <input type="checkbox" name="data.skills.{{key}}.failure" {{checked skill.failure}} data-dtype="Boolean" {{#if skill.cannotBeImprovedByFailure}} disabled {{/if}} 
+                      <input class="percentile-skill-input" type="text" name="system.skills.{{key}}.proficiency" value="{{skill.proficiency}}" data-dtype="Number" {{#if skill.isCalculatedValue}} disabled {{/if}}/>
+                      <input type="checkbox" name="system.skills.{{key}}.failure" {{checked skill.failure}} data-dtype="Boolean" {{#if skill.cannotBeImprovedByFailure}} disabled {{/if}} 
                         title="{{localize 'DG.Tooltip.SkillFailCheckbox'}}"
                         />
                     {{/unless}}
@@ -123,8 +123,8 @@
                   {{/if_eq}}
 
                   {{#if_not_eq key 'ritual' }}
-                    <input class="percentile-skill-input" type="text" name="data.skills.{{key}}.proficiency" value="{{skill.proficiency}}" data-dtype="Number" {{#if skill.isCalculatedValue}} disabled {{/if}}/>
-                    <input type="checkbox" name="data.skills.{{key}}.failure" {{checked skill.failure}} data-dtype="Boolean" {{#if skill.cannotBeImprovedByFailure}} disabled {{/if}} 
+                    <input class="percentile-skill-input" type="text" name="system.skills.{{key}}.proficiency" value="{{skill.proficiency}}" data-dtype="Number" {{#if skill.isCalculatedValue}} disabled {{/if}}/>
+                    <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}}
@@ -138,7 +138,7 @@
               <a class="item-control typed-skill-add"><i class="fas fa-plus"></i>{{localize 'DG.Skills.AddTypedOrCustomSkill'}}</a>
             </div>
             <div class="grid-2col">
-              {{#each actor.data.data.typedSkills as |skill key|}}
+              {{#each actor.system.typedSkills as |skill key|}}
                 <div class="item flexrow flex-group-center">
                   <label class="{{if_gt skill.proficiency 0 'rollable' 'not-rollable'}} skill-label" data-rolltype="skill" data-roll="d100" data-target="{{skill.proficiency}}" data-label="{{skill.label}}" 
                       {{#if skill.proficiency}}title="{{localize 'DG.Tooltip.SkillLabel'}}"{{/if}}
@@ -146,8 +146,8 @@
                     >
                     {{skill.group}} ({{skill.label}})
                   </label>
-                  <input class="percentile-skill-input" type="text" name="data.typedSkills.{{key}}.proficiency" value="{{skill.proficiency}}" data-dtype="Number"/>
-                  <input type="checkbox" name="data.typedSkills.{{key}}.failure" {{checked skill.failure}} data-dtype="Boolean" {{#if skill.cannotBeImprovedByFailure}} disabled {{/if}} />
+                  <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>
@@ -161,16 +161,16 @@
         {{!-- Physical Statistics like STR, CON, etc. --}}
         <div class="tab physical" data-group="primary" data-tab="physical">
           <div class="grid grid-3col">
-            {{#each actor.data.data.statistics as |statistic key|}}
+            {{#each actor.system.statistics as |statistic key|}}
               <div class="flex-group-center">
                 <div class="">
                   <div class="physical-stats-outer-grid-3col">
-                    <label class="rollable" data-rolltype="statistic.x5" data-roll="d100" data-target="statistic.x5" data-label="{{key}}" title="{{localize 'DG.Tooltip.x5AttributeLabel'}}" for="data.statistics.{{key}}.value" class="resource-label">{{localize (concat 'DG.Attributes.' key)}}</label>
-                    <input type="text" name="data.statistics.{{key}}.value" value="{{statistic.value}}" data-dtype="Number"/>
+                    <label class="rollable" data-rolltype="statistic.x5" data-roll="d100" data-target="statistic.x5" data-label="{{key}}" title="{{localize 'DG.Tooltip.x5AttributeLabel'}}" for="system.statistics.{{key}}.value" class="resource-label">{{localize (concat 'DG.Attributes.' key)}}</label>
+                    <input type="text" name="system.statistics.{{key}}.value" value="{{statistic.value}}" data-dtype="Number"/>
                     <span >({{numberFormat statistic.x5 decimals=0 sign=false}}%)</span>
                   </div >
                   <div >
-                    <input type="text" name="data.statistics.{{key}}.distinguishing_feature" value="{{statistic.distinguishing_feature}}" data-dtype="String" title="{{localize 'DG.Tooltip.DistinguishingFeature'}}" />
+                    <input type="text" name="system.statistics.{{key}}.distinguishing_feature" value="{{statistic.distinguishing_feature}}" data-dtype="String" title="{{localize 'DG.Tooltip.DistinguishingFeature'}}" />
                   </div>
                 </div>
               </div>
@@ -181,13 +181,13 @@
               <label class="bolded-label first-aid-label"
                 title="{{localize 'DG.Tooltip.FirstAidAttempted'}}"
               >{{localize 'DG.Physical.FirstAidLabel'}}</label>
-              <input class="labeled-resource-checkbox" type="checkbox" name="data.physical.firstAidAttempted" {{checked actor.data.data.physical.firstAidAttempted}} data-dtype="Boolean" title="{{localize 'DG.Tooltip.FirstAidAttempted'}}" />
+              <input class="labeled-resource-checkbox" type="checkbox" name="system.physical.firstAidAttempted" {{checked actor.system.physical.firstAidAttempted}} data-dtype="Boolean" title="{{localize 'DG.Tooltip.FirstAidAttempted'}}" />
             </div>
             <div>
               <label class="bolded-label">{{localize 'DG.Physical.Wounds'}}</label>
-              <!--<input class="fill-remaining-space" type="text" name="data.physical.wounds" value="{{data.physical.wounds}}" data-dtype="String" /> -->
+              <!--<input class="fill-remaining-space" type="text" name="system.physical.wounds" value="{{system.physical.wounds}}" data-dtype="String" /> -->
               <!-- This seems to save values, but not retrieve them... -->
-              <textarea class="wounds" rows="10" cols="10" name="data.physical.wounds">{{actor.data.data.physical.wounds}}</textarea>
+              <textarea class="wounds" rows="10" cols="10" name="system.physical.wounds">{{actor.system.physical.wounds}}</textarea>
             </div>
           </div>
         </div>
@@ -197,7 +197,7 @@
           <div class="">
               <div class="breaking-point-grid-3col">
                 <label class="bolded-label">{{localize 'DG.Mental.BreakingPoint'}}</label>
-                <input class="centered-input-value" title="{{localize 'DG.Tooltip.BreakPoint'}}" type="text" name="data.sanity.currentBreakingPoint" value="{{actor.data.data.sanity.currentBreakingPoint}}" data-dtype="Number"/>
+                <input class="centered-input-value" title="{{localize 'DG.Tooltip.BreakPoint'}}" type="text" name="system.sanity.currentBreakingPoint" value="{{actor.system.sanity.currentBreakingPoint}}" data-dtype="Number"/>
                 <a class="btn-tiny btn-reset-breaking-point" title="Reset breaking point to be current SAN - WP.">{{localize 'DG.Mental.Reset'}}</a>
               </div>
           
@@ -206,27 +206,27 @@
                 <div class="adaptation-grid-5col">
                   
                   <Label>{{localize 'DG.Mental.Violence'}}</Label>
-                  <input class="labeled-resource-checkbox" type="checkbox" name="data.sanity.adaptations.violence.incident1" {{checked actor.data.data.sanity.adaptations.violence.incident1}} data-dtype="Boolean" />
-                  <input class="labeled-resource-checkbox" type="checkbox" name="data.sanity.adaptations.violence.incident2" {{checked actor.data.data.sanity.adaptations.violence.incident2}} data-dtype="Boolean" />
-                  <input class="labeled-resource-checkbox" type="checkbox" name="data.sanity.adaptations.violence.incident3" {{checked actor.data.data.sanity.adaptations.violence.incident3}} data-dtype="Boolean" />
+                  <input class="labeled-resource-checkbox" type="checkbox" name="system.sanity.adaptations.violence.incident1" {{checked actor.system.sanity.adaptations.violence.incident1}} data-dtype="Boolean" />
+                  <input class="labeled-resource-checkbox" type="checkbox" name="system.sanity.adaptations.violence.incident2" {{checked actor.system.sanity.adaptations.violence.incident2}} data-dtype="Boolean" />
+                  <input class="labeled-resource-checkbox" type="checkbox" name="system.sanity.adaptations.violence.incident3" {{checked actor.system.sanity.adaptations.violence.incident3}} data-dtype="Boolean" />
                   
                   <label class="adapted-label"
                     title="{{localize 'DG.Tooltip.AdaptedToViolence'}}"
                   >
-                  {{#if actor.data.data.sanity.adaptations.violence.isAdapted}}
+                  {{#if actor.system.sanity.adaptations.violence.isAdapted}}
                     {{localize 'DG.Mental.AdaptedToViolence'}}
                   {{/if}}
                   </label>
                   
                   <label>{{localize 'DG.Mental.Helplessness'}}</label>
-                  <input class="labeled-resource-checkbox" type="checkbox" name="data.sanity.adaptations.helplessness.incident1" {{checked actor.data.data.sanity.adaptations.helplessness.incident1}} data-dtype="Boolean" />
-                  <input class="labeled-resource-checkbox" type="checkbox" name="data.sanity.adaptations.helplessness.incident2" {{checked actor.data.data.sanity.adaptations.helplessness.incident2}} data-dtype="Boolean" />
-                  <input class="labeled-resource-checkbox" type="checkbox" name="data.sanity.adaptations.helplessness.incident3" {{checked actor.data.data.sanity.adaptations.helplessness.incident3}} data-dtype="Boolean" />
+                  <input class="labeled-resource-checkbox" type="checkbox" name="system.sanity.adaptations.helplessness.incident1" {{checked actor.system.sanity.adaptations.helplessness.incident1}} data-dtype="Boolean" />
+                  <input class="labeled-resource-checkbox" type="checkbox" name="system.sanity.adaptations.helplessness.incident2" {{checked actor.system.sanity.adaptations.helplessness.incident2}} data-dtype="Boolean" />
+                  <input class="labeled-resource-checkbox" type="checkbox" name="system.sanity.adaptations.helplessness.incident3" {{checked actor.system.sanity.adaptations.helplessness.incident3}} data-dtype="Boolean" />
                   
                   <label class="adapted-label"
                     title="{{localize 'DG.Tooltip.AdaptedToHelplessness'}}"
                   >
-                  {{#if actor.data.data.sanity.adaptations.helplessness.isAdapted}}
+                  {{#if actor.system.sanity.adaptations.helplessness.isAdapted}}
                     {{localize 'DG.Mental.AdaptedToHelplessness'}}
                   {{/if}}
                   </label>
@@ -251,15 +251,15 @@
 
                   <li class="item flexrow" data-item-id="{{item.id}}">
                     <h4 class="item-name"
-                      {{#if item.data.data.crossedOut}}
+                      {{#if item.system.crossedOut}}
                         style="text-decoration: line-through;"
                       {{/if}}
                       >
                       {{item.name}}
                     </h4>
 
-                    {{#if item.data.data.crossedOut}}
-                      <h4 class="item-name">{{item.data.data.disorder}}</h4>
+                    {{#if item.system.crossedOut}}
+                      <h4 class="item-name">{{item.system.disorder}}</h4>
                     {{/if}}
 
                     <div class="item-controls">
@@ -305,32 +305,32 @@
                       class="item-name rollable" 
                       data-roll="d100"
                       data-rolltype="weaponskill" 
-                      data-target="{{item.data.data.skill}}"                         
-                      data-label="{{localizeWeaponSkill item.data.data.skill}}"
-                      title="{{localize 'DG.Tooltip.SkillLabel'}} ({{localizeWeaponSkill item.data.data.skill}})"
+                      data-target="{{item.system.skill}}"                         
+                      data-label="{{localizeWeaponSkill item.system.skill}}"
+                      title="{{localize 'DG.Tooltip.SkillLabel'}} ({{localizeWeaponSkill item.system.skill}})"
                       >
                         {{item.name}}
                     </h4>
 
-                    {{#unless item.data.data.isLethal}}
+                    {{#unless item.system.isLethal}}
                     <span class="rollable centered-item-property" 
                       
                       data-rolltype="damage" 
                       data-target="damage" 
                       data-label="{{toUpperCase item.name}}" 
-                      data-roll="{{toUpperCase item.data.data.damage}}"
-                      data-skill="{{item.data.data.skill}}"
+                      data-roll="{{toUpperCase item.system.damage}}"
+                      data-skill="{{item.system.skill}}"
                       >                      
-                      {{toUpperCase item.data.data.damage}}{{#if_eq item.data.data.skill 'unarmed_combat'}}{{actor.data.data.statistics.str.meleeDamageBonusFormula}}{{/if_eq}}{{#if_eq item.data.data.skill 'melee_weapons'}}{{actor.data.data.statistics.str.meleeDamageBonusFormula}}{{/if_eq}}</span>
+                      {{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.data.data.isLethal}}
-                    <span class="rollable  centered-item-property" data-rolltype="lethality" data-target="{{item.data.data.lethality}}" data-label="{{item.name}}" data-roll="d100"
+                    {{#if item.system.isLethal}}
+                    <span class="rollable  centered-item-property" data-rolltype="lethality" data-target="{{item.system.lethality}}" data-label="{{item.name}}" data-roll="d100"
                       title="{{localize 'DG.ItemWindow.Weapons.LethalityTooltip'}}"
-                      >{{formatLethality item.data.data.lethality}}</span>
+                      >{{formatLethality item.system.lethality}}</span>
                     {{/if}}
 
-                    <span class="centered-item-property">{{item.data.data.armorPiercing}}</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>
@@ -366,10 +366,10 @@
                   <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.data.data.protection}}</span>
+                    <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.data.data.equipped}}
+                      {{#if item.system.equipped}}
                         <span class="fas fa-check"></span>
                       {{else}}
                         <span class="fas fa-times"></span>
@@ -415,7 +415,7 @@
                     
                     <span class="equipped-item centered-item-property" data-id="{{item.id}}" title="{{localize 'DG.Tooltip.ToggleEquippedState'}}" >
                       
-                      {{#if item.data.data.equipped}}
+                      {{#if item.system.equipped}}
                         <span class="fas fa-check"></span>
                       {{else}}
                         <span class="fas fa-times"></span>
@@ -463,8 +463,8 @@
                   <li class="item flexrow" data-item-id="{{item.id}}">
                     
                     <h4 style="word-wrap: break-word;" class="item-name">{{item.name}}</h4>
-                    <span>{{item.data.data.relationship}}</span>
-                    <span>{{item.data.data.score}}</span>                    
+                    <span>{{item.system.relationship}}</span>
+                    <span>{{item.system.score}}</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>
diff --git a/templates/actor/cv-partial.html b/templates/actor/cv-partial.html
index aeeec1c..148b02a 100644
--- a/templates/actor/cv-partial.html
+++ b/templates/actor/cv-partial.html
@@ -1,24 +1,24 @@
 <div class="bio-grid-5col bio-grid-top-border">
     <span>{{localize 'DG.CV.Sex'}}</span>
-    <input class="fill-remaining-space" type="text" name="data.biography.sex" value="{{actor.data.data.biography.sex}}" data-dtype="String" placeholder="{{localize 'DG.CV.SexPlaceholder'}}" />
+    <input class="fill-remaining-space" type="text" name="system.biography.sex" value="{{actor.system.biography.sex}}" data-dtype="String" placeholder="{{localize 'DG.CV.SexPlaceholder'}}" />
     <span></span>
     <span class="bio-grid-label">{{localize 'DG.CV.AgeAndDoB'}}</span>
-    <input class="fill-remaining-space" type="text" name="data.biography.age" value="{{actor.data.data.biography.age}}" data-dtype="String" placeholder="{{localize 'DG.CV.AgeAndDoBPlaceholder'}}" />
+    <input class="fill-remaining-space" type="text" name="system.biography.age" value="{{actor.system.biography.age}}" data-dtype="String" placeholder="{{localize 'DG.CV.AgeAndDoBPlaceholder'}}" />
 </div>
 
 <div class="bio-grid-2col">
   
     <span>{{localize 'DG.CV.Employer'}}</span>
-    <input class="fill-remaining-space" type="text" name="data.biography.employer" value="{{actor.data.data.biography.employer}}" data-dtype="String" placeholder="{{localize 'DG.CV.EmployerPlaceholder'}}" />
+    <input class="fill-remaining-space" type="text" name="system.biography.employer" value="{{actor.system.biography.employer}}" data-dtype="String" placeholder="{{localize 'DG.CV.EmployerPlaceholder'}}" />
   
     <span>{{localize 'DG.CV.Nationality'}}</span>
-    <input class="fill-remaining-space" type="text" name="data.biography.nationality" value="{{actor.data.data.biography.nationality}}" data-dtype="String" placeholder="{{localize 'DG.CV.NationalityPlaceholder'}}" />
+    <input class="fill-remaining-space" type="text" name="system.biography.nationality" value="{{actor.system.biography.nationality}}" data-dtype="String" placeholder="{{localize 'DG.CV.NationalityPlaceholder'}}" />
   
 </div>
 
 <div class="bio-grid-2col">
     <span>{{localize 'DG.CV.Education'}}</span>
-    <input class="fill-remaining-space" type="text" name="data.biography.education" value="{{actor.data.data.biography.education}}" data-dtype="String" placeholder="{{localize 'DG.CV.EducationPlaceholder'}}" />
+    <input class="fill-remaining-space" type="text" name="system.biography.education" value="{{actor.system.biography.education}}" data-dtype="String" placeholder="{{localize 'DG.CV.EducationPlaceholder'}}" />
 </div>
 
 {{#if (playerHasGamemasterPrivileges)}}
@@ -27,20 +27,20 @@
     <span class="yellow-king yellow-king-rotate2">{{localize 'DG.ImpossibleLanscapes.IHaveSeenThe'}}</span>
     <span></span>
     <span class="yellow-king yellow-sign">{{localize 'DG.ImpossibleLanscapes.YellowSign'}}</span>
-    <input type="checkbox" name="data.corruption.haveSeenTheYellowSign" {{checked actor.data.data.corruption.haveSeenTheYellowSign}} data-dtype="Boolean" />
+    <input type="checkbox" name="system.corruption.haveSeenTheYellowSign" {{checked actor.system.corruption.haveSeenTheYellowSign}} data-dtype="Boolean" />
     <span></span>
     <span class="yellow-king yellow-king-rotate1">{{localize 'DG.ImpossibleLanscapes.CorruptionFirstHalf'}}</span>
     <span class="yellow-king yellow-king-rotate4">{{localize 'DG.ImpossibleLanscapes.CorruptionSecondHalf'}}</span>
     <span></span>
-    <input class="yellow-king" type="number" placeholder="0" name="data.corruption.value" value="{{actor.data.data.corruption.value}}" />
+    <input class="yellow-king" type="number" placeholder="0" name="system.corruption.value" value="{{actor.system.corruption.value}}" />
 </div>
 
 <div class="yellow-king yellow-king-grid-5col">
     <span class="yellow-king-label">{{localize 'DG.ImpossibleLanscapes.Gift'}}</span>
-    <input class="fill-remaining-space" type="text" name="data.corruption.gift" value="{{actor.data.data.corruption.gift}}" data-dtype="String" />
+    <input class="fill-remaining-space" type="text" name="system.corruption.gift" value="{{actor.system.corruption.gift}}" data-dtype="String" />
     <span></span>
     <span class="yellow-king-label">{{localize 'DG.ImpossibleLanscapes.Insight'}}</span>
-    <input class="fill-remaining-space" type="text" name="data.corruption.insight" value="{{actor.data.data.corruption.insight}}" data-dtype="String" />
+    <input class="fill-remaining-space" type="text" name="system.corruption.insight" value="{{actor.system.corruption.insight}}" data-dtype="String" />
 </div>
 
 {{/if}}
@@ -50,5 +50,5 @@
 </div>
 
 <div class="editor-host">
-    {{editor content=actor.data.data.physicalDescription target="data.physicalDescription" button=true owner=owner editable=editable}}
+    {{editor actor.system.physicalDescription target="system.physicalDescription" button=true owner=owner editable=editable}}
 </div>
\ No newline at end of file
diff --git a/templates/actor/limited-sheet.html b/templates/actor/limited-sheet.html
index 65af6a2..8126f1b 100644
--- a/templates/actor/limited-sheet.html
+++ b/templates/actor/limited-sheet.html
@@ -13,7 +13,7 @@
               <h1 class="charname"><input name="name" type="text" value="{{actor.name}}" title="{{localize 'DG.AgentNameFieldTooltip' }}"/></h1>
             </div>
             <div>
-              <h2 class="profession"><input name="data.biography.profession" type="text" value="{{data.data.biography.profession}}" placeholder="{{localize 'DG.FallbackText.ProfessionAndOrRank'}}"/></h1>
+              <h2 class="profession"><input name="system.biography.profession" type="text" value="{{system.biography.profession}}" placeholder="{{localize 'DG.FallbackText.ProfessionAndOrRank'}}"/></h1>
             </div>
           </div>
         </div>
diff --git a/templates/actor/npc-sheet.html b/templates/actor/npc-sheet.html
index 02805df..aa0da74 100644
--- a/templates/actor/npc-sheet.html
+++ b/templates/actor/npc-sheet.html
@@ -13,7 +13,7 @@
             <h1 class="charname"><input name="name" type="text" value="{{actor.name}}" /></h1>
           </div>
           <div class="">
-            <h2 class="profession"><input name="data.shortDescription" type="text" value="{{actor.data.data.shortDescription}}" placeholder="{{localize 'DG.FallbackText.ProfessionAndOrRank'}}"/></h1>
+            <h2 class="profession"><input name="system.shortDescription" type="text" value="{{actor.system.shortDescription}}" placeholder="{{localize 'DG.FallbackText.ProfessionAndOrRank'}}"/></h1>
           </div>
         </div>
       </div>
@@ -22,33 +22,33 @@
         
         {{!-- HP --}}
         <div class="resource-outer-grid-1col">
-            <label for="actor.data.data.health.value" class="resource-label" title="{{localize 'DG.Tooltip.HP'}}">{{localize 'DG.Attributes.HP'}} (<span>{{actor.data.data.health.protection}} <i class="fas fa-shield-alt"></i></span>)</label>
+            <label for="actor.system.health.value" class="resource-label" title="{{localize 'DG.Tooltip.HP'}}">{{localize 'DG.Attributes.HP'}} (<span>{{actor.system.health.protection}} <i class="fas fa-shield-alt"></i></span>)</label>
             <div class="resource-inner-grid-3col">
-              <input type="text" name="data.health.value" value="{{actor.data.data.health.value}}" data-dtype="Number"/>
+              <input type="text" name="system.health.value" value="{{actor.system.health.value}}" data-dtype="Number"/>
               <span> / </span>
-              <input type="text" name="data.health.max" value="{{actor.data.data.health.max}}" data-dtype="Number"/>
+              <input type="text" name="system.health.max" value="{{actor.system.health.max}}" data-dtype="Number"/>
             </div>
         </div>
 
         {{!-- WP --}}
         <div class="resource-outer-grid-1col">
-            <label for="data.wp.value" class="resource-label" title="{{localize 'DG.Tooltip.WP'}}">{{localize 'DG.Attributes.WP' }}</label>
+            <label for="system.wp.value" class="resource-label" title="{{localize 'DG.Tooltip.WP'}}">{{localize 'DG.Attributes.WP' }}</label>
             <div class="resource-inner-grid-3col">
-              <input type="text" name="data.wp.value" value="{{actor.data.data.wp.value}}" data-dtype="Number"/>
+              <input type="text" name="system.wp.value" value="{{actor.system.wp.value}}" data-dtype="Number"/>
               <span> / </span>
-              <input type="text" name="data.wp.max" value="{{actor.data.data.wp.max}}" data-dtype="Number"/>
+              <input type="text" name="system.wp.max" value="{{actor.system.wp.max}}" data-dtype="Number"/>
             </div>
         </div>
 
         {{!-- Sanity --}}
         <div class="resource-outer-grid-1col">
-            <label for="data.wp.value" class="resource-label rollable"
+            <label for="system.wp.value" class="resource-label rollable"
               data-rolltype="sanity" data-roll="d100" data-target="sanity" data-label="SAN" title="{{localize 'DG.Tooltip.SanityLabel'}}"
             >{{localize 'DG.Attributes.SAN' }}</label>
             <div class="resource-inner-grid-3col">
-              <input type="text" name="data.sanity.value" value="{{actor.data.data.sanity.value}}" data-dtype="Number" title="{{localize 'DG.Tooltip.CurrentSanityPartOne'}}{{actor.data.data.sanity.currentBreakingPoint}}{{localize 'DG.Tooltip.CurrentSanityPartTwo'}}" />
+              <input type="text" name="system.sanity.value" value="{{actor.system.sanity.value}}" data-dtype="Number" title="{{localize 'DG.Tooltip.CurrentSanityPartOne'}}{{actor.system.sanity.currentBreakingPoint}}{{localize 'DG.Tooltip.CurrentSanityPartTwo'}}" />
               <span> {{localize 'DG.NPCSheet.BreakPointAbbreviation'}}: </span>
-              <input type="text" name="data.sanity.currentBreakingPoint" value="{{actor.data.data.sanity.currentBreakingPoint}}" data-dtype="Number" title="{{localize 'DG.Tooltip.BreakPoint'}}" />
+              <input type="text" name="system.sanity.currentBreakingPoint" value="{{actor.system.sanity.currentBreakingPoint}}" data-dtype="Number" title="{{localize 'DG.Tooltip.BreakPoint'}}" />
             </div>
         </div>
       </div>
@@ -58,15 +58,15 @@
       {{!-- Physical Statistics like STR, CON, etc. --}}
       <div class="">
         <div class="grid grid-3col">
-          {{#each actor.data.data.statistics as |statistic key|}}
+          {{#each actor.system.statistics as |statistic key|}}
             <div class="flex-group-center">
               <div class="">
                 <div class="physical-stats-outer-grid-3col">
-                  <label class="rollable" data-rolltype="statistic.x5" data-roll="d100" data-target="statistic.x5" data-label="{{key}}" title="{{localize 'DG.Tooltip.x5AttributeLabel'}}" for="data.statistics.{{key}}.value" class="resource-label">{{localize (concat 'DG.Attributes.' key)}}</label>
-                  <input type="text" name="data.statistics.{{key}}.value" value="{{statistic.value}}" data-dtype="Number"/>
+                  <label class="rollable" data-rolltype="statistic.x5" data-roll="d100" data-target="statistic.x5" data-label="{{key}}" title="{{localize 'DG.Tooltip.x5AttributeLabel'}}" for="system.statistics.{{key}}.value" class="resource-label">{{localize (concat 'DG.Attributes.' key)}}</label>
+                  <input type="text" name="system.statistics.{{key}}.value" value="{{statistic.value}}" data-dtype="Number"/>
                   <span >({{numberFormat statistic.x5 decimals=0 sign=false}}%)</span>
                 </div >
-                {{!-- <div> <input type="text" name="data.statistics.{{key}}.distinguishing_feature" value="{{statistic.distinguishing_feature}}" data-dtype="String" title="{{localize 'DG.Tooltip.DistinguishingFeature'}}" /> </div> --}}
+                {{!-- <div> <input type="text" name="system.statistics.{{key}}.distinguishing_feature" value="{{statistic.distinguishing_feature}}" data-dtype="String" title="{{localize 'DG.Tooltip.DistinguishingFeature'}}" /> </div> --}}
               </div>
             </div>
           {{/each}}
@@ -90,22 +90,22 @@
     <div class="tab skills" data-group="primary" data-tab="skills">
       {{!-- Checkbox to hide/show skills that are at zero --}}
       <div>
-        <span class="resource-label" for="data.showUntrainedSkills">{{localize 'DG.UnnaturalSheet.HideUntrainedSkillsLabel'}}:</label>
-        <input class="labeled-resource-checkbox" type="checkbox" name="data.showUntrainedSkills" {{checked data.data.showUntrainedSkills}} data-dtype="Boolean" />
+        <span class="resource-label" for="system.showUntrainedSkills">{{localize 'DG.UnnaturalSheet.HideUntrainedSkillsLabel'}}:</label>
+        <input class="labeled-resource-checkbox" type="checkbox" name="system.showUntrainedSkills" {{checked system.showUntrainedSkills}} data-dtype="Boolean" />
       </div>
 
       <div class="grid grid-3col">
-        {{#each actor.data.data.skills as |skill key|}}
+        {{#each actor.system.skills as |skill key|}}
           
-          {{#if (hideSkillBasedOnProficiencyAndUserChoice ../actor.data.data.showUntrainedSkills skill.proficiency)}}
+          {{#if (hideSkillBasedOnProficiencyAndUserChoice ../actor.system.showUntrainedSkills skill.proficiency)}}
           <div class="flexrow flex-group-center">
-            <label class="{{if_gt skill.proficiency 0 'rollable' 'not-rollable'}} skill-label" data-rolltype="skill" data-roll="d100" data-target="{{skill.proficiency}}" data-label="{{localize (concat 'DG.Skills.' key)}}" for="data.skills.{{key}}.value" 
+            <label class="{{if_gt skill.proficiency 0 'rollable' 'not-rollable'}} skill-label" data-rolltype="skill" data-roll="d100" data-target="{{skill.proficiency}}" data-label="{{localize (concat 'DG.Skills.' key)}}" for="system.skills.{{key}}.value" 
                 {{#if skill.proficiency}}title="{{localize 'DG.Tooltip.SkillLabel'}}"{{/if}}
                 {{#unless skill.proficiency}}title="{{localize 'DG.Tooltip.CannotRollSkillLabel'}}"{{/unless}}
               >
               {{ localize (concat "DG.Skills." key) }}
             </label>
-            <input class="percentile-skill-input" type="text" name="data.skills.{{key}}.proficiency" value="{{skill.proficiency}}" data-dtype="Number" {{#if skill.isCalculatedValue}} disabled {{/if}}/>
+            <input class="percentile-skill-input" type="text" name="system.skills.{{key}}.proficiency" value="{{skill.proficiency}}" data-dtype="Number" {{#if skill.isCalculatedValue}} disabled {{/if}}/>
             
           </div>
           {{/if}}
@@ -118,8 +118,8 @@
           <a class="item-control typed-skill-add"><i class="fas fa-plus"></i>{{localize 'DG.Skills.AddTypedOrCustomSkill'}}</a>
         </div>
         <div class="grid-2col">
-          {{#each actor.data.data.typedSkills as |skill key|}}
-            {{#if (hideSkillBasedOnProficiencyAndUserChoice ../actor.data.data.showUntrainedSkills skill.proficiency)}}
+          {{#each actor.system.typedSkills as |skill key|}}
+            {{#if (hideSkillBasedOnProficiencyAndUserChoice ../actor.system.showUntrainedSkills skill.proficiency)}}
             <div class="item flexrow flex-group-center">
               <label class="{{if_gt skill.proficiency 0 'rollable' 'not-rollable'}} skill-label" data-rolltype="skill" data-roll="d100" data-target="{{skill.proficiency}}" data-label="{{skill.label}}" 
                   {{#if skill.proficiency}}title="{{localize 'DG.Tooltip.SkillLabel'}}"{{/if}}
@@ -127,7 +127,7 @@
                 >
                 {{skill.group}} ({{skill.label}})
               </label>
-              <input class="percentile-skill-input" type="text" name="data.typedSkills.{{key}}.proficiency" value="{{skill.proficiency}}" data-dtype="Number"/>
+              <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-delete" title="Delete Skill"><i class="fas fa-trash" data-typedskill="{{key}}" ></i></a>
@@ -143,7 +143,7 @@
       </div>
       <div class="unnatural-notes-section">
         <div class="editor-host">
-          {{editor content=actor.data.data.notes target="data.notes" button=true owner=owner editable=editable}}
+          {{editor actor.system.notes target="system.notes" button=true owner=owner editable=editable}}
         </div>
       </div>
       
@@ -180,32 +180,32 @@
                   class="item-name rollable" 
                   data-roll="d100"
                   data-rolltype="weaponskill" 
-                  data-target="{{item.data.data.skill}}"                         
-                  data-label="{{localizeWeaponSkill item.data.data.skill}}"
-                  title="{{localize 'DG.Tooltip.SkillLabel'}} ({{localizeWeaponSkill item.data.data.skill}})"
+                  data-target="{{item.system.skill}}"                         
+                  data-label="{{localizeWeaponSkill item.system.skill}}"
+                  title="{{localize 'DG.Tooltip.SkillLabel'}} ({{localizeWeaponSkill item.system.skill}})"
                   >
                     {{item.name}}
                 </h4>
 
-                {{#unless item.data.data.isLethal}}
+                {{#unless item.system.isLethal}}
                 <span class="rollable centered-item-property" 
                   
                   data-rolltype="damage" 
                   data-target="damage" 
                   data-label="{{toUpperCase item.name}}" 
-                  data-roll="{{toUpperCase item.data.data.damage}}"
-                  data-skill="{{item.data.data.skill}}"
+                  data-roll="{{toUpperCase item.system.damage}}"
+                  data-skill="{{item.system.skill}}"
                   >                      
-                  {{toUpperCase item.data.data.damage}}</span>
+                  {{toUpperCase item.system.damage}}</span>
                 {{/unless}}
 
-                {{#if item.data.data.isLethal}}
-                <span class="rollable  centered-item-property" data-rolltype="lethality" data-target="{{item.data.data.lethality}}" data-label="{{item.name}}" data-roll="d100"
+                {{#if item.system.isLethal}}
+                <span class="rollable  centered-item-property" data-rolltype="lethality" data-target="{{item.system.lethality}}" data-label="{{item.name}}" data-roll="d100"
                   title="{{localize 'DG.ItemWindow.Weapons.LethalityTooltip'}}"
-                  >{{formatLethality item.data.data.lethality}}</span>
+                  >{{formatLethality item.system.lethality}}</span>
                 {{/if}}
 
-                <span class="centered-item-property">{{item.data.data.armorPiercing}}</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>
@@ -241,10 +241,10 @@
               <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.data.data.protection}}</span>
+                <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.data.data.equipped}}
+                  {{#if item.system.equipped}}
                     <span class="fas fa-check"></span>
                   {{else}}
                     <span class="fas fa-times"></span>
@@ -291,7 +291,7 @@
                 
                 <span class="equipped-item centered-item-property" data-id="{{item.id}}" title="{{localize 'DG.Tooltip.ToggleEquippedState'}}" >
                   
-                  {{#if item.data.data.equipped}}
+                  {{#if item.system.equipped}}
                     <span class="fas fa-check"></span>
                   {{else}}
                     <span class="fas fa-times"></span>
diff --git a/templates/actor/unnatural-sheet.html b/templates/actor/unnatural-sheet.html
index 54b62d5..ac20b0d 100644
--- a/templates/actor/unnatural-sheet.html
+++ b/templates/actor/unnatural-sheet.html
@@ -13,7 +13,7 @@
             <h1 class="charname"><input name="name" type="text" value="{{actor.name}}" /></h1>
           </div>
           <div class="">
-            <h2 class="profession"><input name="data.shortDescription" type="text" value="{{actor.data.data.shortDescription}}" placeholder="{{localize 'DG.UnnaturalSheet.ShortDescriptionFallbackText'}}"/></h1>
+            <h2 class="profession"><input name="system.shortDescription" type="text" value="{{actor.system.shortDescription}}" placeholder="{{localize 'DG.UnnaturalSheet.ShortDescriptionFallbackText'}}"/></h1>
           </div>
         </div>
       </div>
@@ -22,31 +22,31 @@
         
         {{!-- HP --}}
         <div class="resource-outer-grid-1col">
-            <label for="actor.data.data.health.value" class="resource-label" title="{{localize 'DG.Tooltip.HP'}}">{{localize 'DG.Attributes.HP'}} (<span>{{actor.data.data.health.protection}} <i class="fas fa-shield-alt"></i></span>)</label>
+            <label for="actor.system.health.value" class="resource-label" title="{{localize 'DG.Tooltip.HP'}}">{{localize 'DG.Attributes.HP'}} (<span>{{actor.system.health.protection}} <i class="fas fa-shield-alt"></i></span>)</label>
             <div class="resource-inner-grid-3col">
-              <input type="text" name="data.health.value" value="{{actor.data.data.health.value}}" data-dtype="Number"/>
+              <input type="text" name="system.health.value" value="{{actor.system.health.value}}" data-dtype="Number"/>
               <span> / </span>
-              <input type="text" name="data.health.max" value="{{actor.data.data.health.max}}" data-dtype="Number"/>
+              <input type="text" name="system.health.max" value="{{actor.system.health.max}}" data-dtype="Number"/>
             </div>
         </div>
 
         {{!-- WP --}}
         <div class="resource-outer-grid-1col">
-            <label for="data.wp.value" class="resource-label">{{localize 'DG.Attributes.WP' }}</label>
+            <label for="system.wp.value" class="resource-label">{{localize 'DG.Attributes.WP' }}</label>
             <div class="resource-inner-grid-3col">
-              <input type="text" name="data.wp.value" value="{{actor.data.data.wp.value}}" data-dtype="Number"/>
+              <input type="text" name="system.wp.value" value="{{actor.system.wp.value}}" data-dtype="Number"/>
               <span> / </span>
-              <input type="text" name="data.wp.max" value="{{actor.data.data.wp.max}}" data-dtype="Number"/>
+              <input type="text" name="system.wp.max" value="{{actor.system.wp.max}}" data-dtype="Number"/>
             </div>
         </div>
 
         {{!-- Sanity Damage --}}
         <div class="resource-outer-grid-1col">
-          <label for="data.wp.value" class="resource-label">Sanity Damage</label>
+          <label for="system.wp.value" class="resource-label">Sanity Damage</label>
           <div class="resource-inner-grid-3col">
-            <input type="text" name="data.sanity.successLoss" value="{{actor.data.data.sanity.successLoss}}" />
+            <input type="text" name="system.sanity.successLoss" value="{{actor.system.sanity.successLoss}}" />
             <span> / </span>
-            <input type="text" name="data.sanity.failedLoss" value="{{actor.data.data.sanity.failedLoss}}" />
+            <input type="text" name="system.sanity.failedLoss" value="{{actor.system.sanity.failedLoss}}" />
           </div>
         </div>
       </div>
@@ -56,12 +56,12 @@
       {{!-- Physical Statistics like STR, CON, etc. --}}
       <div class="">
         <div class="grid grid-3col">
-          {{#each actor.data.data.statistics as |statistic key|}}
+          {{#each actor.system.statistics as |statistic key|}}
             <div class="flex-group-center">
               <div class="">
                 <div class="physical-stats-outer-grid-3col">
-                  <label class="rollable" data-rolltype="statistic.x5" data-roll="d100" data-target="statistic.x5" data-label="{{key}}" for="data.statistics.{{key}}.value" class="resource-label">{{localize (concat 'DG.Attributes.' key)}}</label>
-                  <input type="text" name="data.statistics.{{key}}.value" value="{{statistic.value}}" data-dtype="Number"/>
+                  <label class="rollable" data-rolltype="statistic.x5" data-roll="d100" data-target="statistic.x5" data-label="{{key}}" for="system.statistics.{{key}}.value" class="resource-label">{{localize (concat 'DG.Attributes.' key)}}</label>
+                  <input type="text" name="system.statistics.{{key}}.value" value="{{statistic.value}}" data-dtype="Number"/>
                   <span >({{numberFormat statistic.x5 decimals=0 sign=false}}%)</span>
                 </div >
               </div>
@@ -87,22 +87,22 @@
     <div class="tab skills" data-group="primary" data-tab="skills">
       {{!-- Checkbox to hide/show skills that are at zero --}}
       <div>
-        <span class="resource-label" for="data.showUntrainedSkills">{{localize 'DG.UnnaturalSheet.HideUntrainedSkillsLabel'}}:</label>
-        <input class="labeled-resource-checkbox" type="checkbox" name="data.showUntrainedSkills" {{checked data.data.showUntrainedSkills}} data-dtype="Boolean" />
+        <span class="resource-label" for="system.showUntrainedSkills">{{localize 'DG.UnnaturalSheet.HideUntrainedSkillsLabel'}}:</label>
+        <input class="labeled-resource-checkbox" type="checkbox" name="system.showUntrainedSkills" {{checked system.showUntrainedSkills}} data-dtype="Boolean" />
       </div>
 
       <div class="grid grid-3col">
-        {{#each actor.data.data.skills as |skill key|}}
+        {{#each actor.system.skills as |skill key|}}
           
-          {{#if (hideSkillBasedOnProficiencyAndUserChoice ../actor.data.data.showUntrainedSkills skill.proficiency)}}
+          {{#if (hideSkillBasedOnProficiencyAndUserChoice ../actor.system.showUntrainedSkills skill.proficiency)}}
           <div class="flexrow flex-group-center">
-            <label class="{{if_gt skill.proficiency 0 'rollable' 'not-rollable'}} skill-label" data-rolltype="skill" data-roll="d100" data-target="{{skill.proficiency}}" data-label="{{localize (concat 'DG.Skills.' key)}}" for="data.skills.{{key}}.value" 
+            <label class="{{if_gt skill.proficiency 0 'rollable' 'not-rollable'}} skill-label" data-rolltype="skill" data-roll="d100" data-target="{{skill.proficiency}}" data-label="{{localize (concat 'DG.Skills.' key)}}" for="system.skills.{{key}}.value" 
                 {{#if skill.proficiency}}title="{{localize 'DG.Tooltip.SkillLabel'}}"{{/if}}
                 {{#unless skill.proficiency}}title="{{localize 'DG.Tooltip.CannotRollSkillLabel'}}"{{/unless}}
               >
               {{ localize (concat "DG.Skills." key) }}
             </label>
-            <input class="percentile-skill-input" type="text" name="data.skills.{{key}}.proficiency" value="{{skill.proficiency}}" data-dtype="Number" {{#if skill.isCalculatedValue}} disabled {{/if}}/>
+            <input class="percentile-skill-input" type="text" name="system.skills.{{key}}.proficiency" value="{{skill.proficiency}}" data-dtype="Number" {{#if skill.isCalculatedValue}} disabled {{/if}}/>
             
           </div>
           {{/if}}
@@ -115,8 +115,8 @@
           <a class="item-control typed-skill-add"><i class="fas fa-plus"></i>{{localize 'DG.Skills.AddTypedOrCustomSkill'}}</a>
         </div>
         <div class="grid-2col">
-          {{#each actor.data.data.typedSkills as |skill key|}}
-            {{#if (hideSkillBasedOnProficiencyAndUserChoice ../actor.data.data.showUntrainedSkills skill.proficiency)}}
+          {{#each actor.system.typedSkills as |skill key|}}
+            {{#if (hideSkillBasedOnProficiencyAndUserChoice ../actor.system.showUntrainedSkills skill.proficiency)}}
             <div class="item flexrow flex-group-center">
               <label class="{{if_gt skill.proficiency 0 'rollable' 'not-rollable'}} skill-label" data-rolltype="skill" data-roll="d100" data-target="{{skill.proficiency}}" data-label="{{skill.label}}" 
                   {{#if skill.proficiency}}title="{{localize 'DG.Tooltip.SkillLabel'}}"{{/if}}
@@ -124,7 +124,7 @@
                 >
                 {{skill.group}} ({{skill.label}})
               </label>
-              <input class="percentile-skill-input" type="text" name="data.typedSkills.{{key}}.proficiency" value="{{skill.proficiency}}" data-dtype="Number"/>
+              <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-delete" title="Delete Skill"><i class="fas fa-trash" data-typedskill="{{key}}" ></i></a>
@@ -140,7 +140,7 @@
       </div>
       <div class="unnatural-notes-section">
         <div class="editor-host">
-          {{editor content=actor.data.data.notes target="data.notes" button=true owner=owner editable=editable}}
+          {{editor actor.system.notes target="system.notes" button=true owner=owner editable=editable}}
         </div>
       </div>
       
@@ -177,32 +177,32 @@
                   class="item-name rollable" 
                   data-roll="d100"
                   data-rolltype="weaponskill" 
-                  data-target="{{item.data.data.skill}}"                         
-                  data-label="{{localizeWeaponSkill item.data.data.skill}}"
-                  title="{{localize 'DG.Tooltip.SkillLabel'}} ({{localizeWeaponSkill item.data.data.skill}})"
+                  data-target="{{item.system.skill}}"                         
+                  data-label="{{localizeWeaponSkill item.system.skill}}"
+                  title="{{localize 'DG.Tooltip.SkillLabel'}} ({{localizeWeaponSkill item.system.skill}})"
                   >
                     {{item.name}}
                 </h4>
 
-                {{#unless item.data.data.isLethal}}
+                {{#unless item.system.isLethal}}
                 <span class="rollable centered-item-property" 
                   
                   data-rolltype="damage" 
                   data-target="damage" 
                   data-label="{{toUpperCase item.name}}" 
-                  data-roll="{{toUpperCase item.data.data.damage}}"
-                  data-skill="{{item.data.data.skill}}"
+                  data-roll="{{toUpperCase item.system.damage}}"
+                  data-skill="{{item.system.skill}}"
                   >                      
-                  {{toUpperCase item.data.data.damage}}</span>
+                  {{toUpperCase item.system.damage}}</span>
                 {{/unless}}
 
-                {{#if item.data.data.isLethal}}
-                <span class="rollable  centered-item-property" data-rolltype="lethality" data-target="{{item.data.data.lethality}}" data-label="{{item.name}}" data-roll="d100"
+                {{#if item.system.isLethal}}
+                <span class="rollable  centered-item-property" data-rolltype="lethality" data-target="{{item.system.lethality}}" data-label="{{item.name}}" data-roll="d100"
                   title="{{localize 'DG.ItemWindow.Weapons.LethalityTooltip'}}"
-                  >{{formatLethality item.data.data.lethality}}</span>
+                  >{{formatLethality item.system.lethality}}</span>
                 {{/if}}
 
-                <span class="centered-item-property">{{item.data.data.armorPiercing}}</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>
@@ -238,10 +238,10 @@
               <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.data.data.protection}}</span>
+                <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.data.data.equipped}}
+                  {{#if item.system.equipped}}
                     <span class="fas fa-check"></span>
                   {{else}}
                     <span class="fas fa-times"></span>
@@ -288,7 +288,7 @@
                 
                 <span class="equipped-item centered-item-property" data-id="{{item.id}}" title="{{localize 'DG.Tooltip.ToggleEquippedState'}}" >
                   
-                  {{#if item.data.data.equipped}}
+                  {{#if item.system.equipped}}
                     <span class="fas fa-check"></span>
                   {{else}}
                     <span class="fas fa-times"></span>
diff --git a/templates/item/item-armor-sheet.html b/templates/item/item-armor-sheet.html
index c7a3d74..934a75e 100644
--- a/templates/item/item-armor-sheet.html
+++ b/templates/item/item-armor-sheet.html
@@ -10,23 +10,23 @@
           <input name="name" type="text" value="{{item.name}}" placeholder="{{localize 'DG.ItemWindow.Armor.NamePlaceholder'}}"/></h1>
                         
           <span class="resource-label">{{localize 'DG.ItemWindow.Armor.Expense'}}:</span>
-          <select name="data.expense" >
-            <option {{#if_eq data.data.expense 'Incidental'}}selected{{/if_eq}} value="Incidental">{{localize 'DG.Gear.Expense.Incidental'}}</option>
-            <option {{#if_eq data.data.expense 'Standard'}}selected{{/if_eq}} value="Standard">{{localize 'DG.Gear.Expense.Standard'}}</option>
-            <option {{#if_eq data.data.expense 'Unusual'}}selected{{/if_eq}} value="Unusual">{{localize 'DG.Gear.Expense.Unusual'}}</option>
-            <option {{#if_eq data.data.expense 'Major'}}selected{{/if_eq}} value="Major">{{localize 'DG.Gear.Expense.Major'}}</option>
-            <option {{#if_eq data.data.expense 'Extreme'}}selected{{/if_eq}} value="Extreme">{{localize 'DG.Gear.Expense.Extreme'}}</option>
+          <select name="system.expense" >
+            <option {{#if_eq system.expense 'Incidental'}}selected{{/if_eq}} value="Incidental">{{localize 'DG.Gear.Expense.Incidental'}}</option>
+            <option {{#if_eq system.expense 'Standard'}}selected{{/if_eq}} value="Standard">{{localize 'DG.Gear.Expense.Standard'}}</option>
+            <option {{#if_eq system.expense 'Unusual'}}selected{{/if_eq}} value="Unusual">{{localize 'DG.Gear.Expense.Unusual'}}</option>
+            <option {{#if_eq system.expense 'Major'}}selected{{/if_eq}} value="Major">{{localize 'DG.Gear.Expense.Major'}}</option>
+            <option {{#if_eq system.expense 'Extreme'}}selected{{/if_eq}} value="Extreme">{{localize 'DG.Gear.Expense.Extreme'}}</option>
           </select>
         
           <span class="resource-label">{{localize 'DG.ItemWindow.Armor.Equipped'}}:</span>
-          <input class="labeled-resource-checkbox" type="checkbox" name="data.equipped" {{checked data.data.equipped}} data-dtype="Boolean" />          
+          <input class="labeled-resource-checkbox" type="checkbox" name="system.equipped" {{checked system.equipped}} data-dtype="Boolean" />          
               
         </div>
       </div>
       
       <div class="armor-sheet-secondary-grid-2col">
         <span class="resource-label">{{localize 'DG.ItemWindow.Armor.ArmorRating'}}:</span>
-        <input class="item-sheet-short-input" type="text" name="data.protection" value="{{data.data.protection}}" data-dtype="Number"/>
+        <input class="item-sheet-short-input" type="text" name="system.protection" value="{{system.protection}}" data-dtype="Number"/>
       </div>
       
     </header>
@@ -41,7 +41,7 @@
 
         {{!-- Description Tab --}}
         <div class="tab" data-group="primary" data-tab="description">
-            {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
+            {{editor system.description target="system.description" button=true owner=owner editable=editable}}
         </div>
     </section>
 </form>
diff --git a/templates/item/item-bond-sheet.html b/templates/item/item-bond-sheet.html
index a995800..54ef5f0 100644
--- a/templates/item/item-bond-sheet.html
+++ b/templates/item/item-bond-sheet.html
@@ -9,12 +9,12 @@
                                 
                 <!-- <label class="resource-label">{{localize 'DG.Bonds.Score'}}</label> -->
                 <span class="resource-label">{{localize 'DG.Bonds.Score'}}:</span>
-                <input type="text" name="data.score" value="{{data.data.score}}" data-dtype="Number"
+                <input type="text" name="system.score" value="{{system.score}}" data-dtype="Number"
                     title="{{localize 'DG.ItemWindow.Bonds.ScoreTooltip'}}"
                 />            
             
                 <span class="resource-label">{{localize 'DG.Bonds.Relationship'}}:</span>
-                <input type="text" name="data.relationship" value="{{data.data.relationship}}" data-dtype="String" />
+                <input type="text" name="system.relationship" value="{{system.relationship}}" data-dtype="String" />
                 
             </div>
         </div>
@@ -30,7 +30,7 @@
 
         {{!-- Description Tab --}}
         <div class="tab" data-group="primary" data-tab="description">
-            {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
+            {{editor system.description target="system.description" button=true owner=owner editable=editable}}
         </div>
     </section>
 </form>
diff --git a/templates/item/item-gear-sheet.html b/templates/item/item-gear-sheet.html
index 22660f7..79de9c4 100644
--- a/templates/item/item-gear-sheet.html
+++ b/templates/item/item-gear-sheet.html
@@ -11,16 +11,16 @@
     
                 
                 <span class="resource-label">{{localize 'DG.ItemWindow.Gear.Expense'}}:</span>
-                <select name="data.expense" >
-                    <option {{#if_eq data.data.expense 'Incidental'}}selected{{/if_eq}} value="Incidental">{{localize 'DG.Gear.Expense.Incidental'}}</option>
-                    <option {{#if_eq data.data.expense 'Standard'}}selected{{/if_eq}} value="Standard">{{localize 'DG.Gear.Expense.Standard'}}</option>
-                    <option {{#if_eq data.data.expense 'Unusual'}}selected{{/if_eq}} value="Unusual">{{localize 'DG.Gear.Expense.Unusual'}}</option>
-                    <option {{#if_eq data.data.expense 'Major'}}selected{{/if_eq}} value="Major">{{localize 'DG.Gear.Expense.Major'}}</option>
-                    <option {{#if_eq data.data.expense 'Extreme'}}selected{{/if_eq}} value="Extreme">{{localize 'DG.Gear.Expense.Extreme'}}</option>
+                <select name="system.expense" >
+                    <option {{#if_eq system.expense 'Incidental'}}selected{{/if_eq}} value="Incidental">{{localize 'DG.Gear.Expense.Incidental'}}</option>
+                    <option {{#if_eq system.expense 'Standard'}}selected{{/if_eq}} value="Standard">{{localize 'DG.Gear.Expense.Standard'}}</option>
+                    <option {{#if_eq system.expense 'Unusual'}}selected{{/if_eq}} value="Unusual">{{localize 'DG.Gear.Expense.Unusual'}}</option>
+                    <option {{#if_eq system.expense 'Major'}}selected{{/if_eq}} value="Major">{{localize 'DG.Gear.Expense.Major'}}</option>
+                    <option {{#if_eq system.expense 'Extreme'}}selected{{/if_eq}} value="Extreme">{{localize 'DG.Gear.Expense.Extreme'}}</option>
                 </select>
                     
                 <span class="resource-label">{{localize 'DG.ItemWindow.Gear.Equipped'}}:</span>
-                <input class="labeled-resource-checkbox" type="checkbox" name="data.equipped" {{checked data.data.equipped}} data-dtype="Boolean" />
+                <input class="labeled-resource-checkbox" type="checkbox" name="system.equipped" {{checked system.equipped}} data-dtype="Boolean" />
                                     
             </div>
         </div>
@@ -38,7 +38,7 @@
 
         {{!-- Description Tab --}}
         <div class="tab" data-group="primary" data-tab="description">
-            {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
+            {{editor system.description target="system.description" button=true owner=owner editable=editable}}
         </div>
         
     </section>
diff --git a/templates/item/item-motivation-sheet.html b/templates/item/item-motivation-sheet.html
index 50a7956..4a07283 100644
--- a/templates/item/item-motivation-sheet.html
+++ b/templates/item/item-motivation-sheet.html
@@ -13,7 +13,7 @@
             
             <div class="motivation-sheet-horizontal-grid-2col">
                 <span class="resource-label">{{localize 'DG.ItemWindow.Motivations.IsDisorder'}}:</span>
-                <input type="checkbox" name="data.crossedOut" {{checked data.data.crossedOut}} data-dtype="Boolean" 
+                <input type="checkbox" name="system.crossedOut" {{checked system.crossedOut}} data-dtype="Boolean" 
                     title="{{localize 'DG.ItemWindow.Motivations.IsDisorderTooltip'}}"
                 />
            
@@ -25,7 +25,7 @@
                      title="{{localize 'DG.ItemWindow.Motivations.MotivationNameTooltip'}}"
                     
                     {{!-- If a motivation has been crossed off after a breaking point, do a strikeout on it and disable it. --}}
-                    {{#if data.data.crossedOut}}
+                    {{#if system.crossedOut}}
                         style="text-decoration: line-through;"
                         disabled
                     {{/if}}
@@ -33,17 +33,17 @@
             
 
             {{!-- Only Show the Disorders Section if Motivation Lost Checked --}}
-            {{#if data.data.crossedOut}}
+            {{#if system.crossedOut}}
             
                 <span class="resource-label">{{localize 'DG.ItemWindow.Motivations.Disorder'}}:</span>
-                <input type="text" name="data.disorder" value="{{data.data.disorder}}" data-dtype="String"
+                <input type="text" name="system.disorder" value="{{system.disorder}}" data-dtype="String"
                     
                     title="{{localize 'DG.ItemWindow.Motivations.DisorderNameTooltip'}}"
                 />
             
             
                 <span class="resource-label">{{localize 'DG.ItemWindow.Motivations.DisorderHasBeenCured'}}: </span>
-                <input class="labeled-resource-checkbox" type="checkbox" name="data.disorderCured" {{checked data.data.disorderCured}} data-dtype="Boolean" 
+                <input class="labeled-resource-checkbox" type="checkbox" name="system.disorderCured" {{checked system.disorderCured}} data-dtype="Boolean" 
                     title="{{localize 'DG.ItemWindow.Motivations.DisorderHasBeenCuredTooltip'}}"
                 />
             
@@ -54,7 +54,7 @@
         </div>
 
         <div class="tab attributes" data-group="primary" data-tab="description">
-            {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
+            {{editor system.description target="system.description" button=true owner=owner editable=editable}}
         </div>
         
     </section>
diff --git a/templates/item/item-weapon-sheet.html b/templates/item/item-weapon-sheet.html
index 2cb597e..e85a2ba 100644
--- a/templates/item/item-weapon-sheet.html
+++ b/templates/item/item-weapon-sheet.html
@@ -10,16 +10,16 @@
           <input name="name" type="text" value="{{item.name}}" placeholder="{{localize 'DG.ItemWindow.Weapons.NamePlaceholder'}}"/>
           
           <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.Expense'}}:</span>
-          <select name="data.expense" >
-            <option {{#if_eq data.data.expense 'Incidental'}}selected{{/if_eq}} value="Incidental">{{localize 'DG.Gear.Expense.Incidental'}}</option>
-            <option {{#if_eq data.data.expense 'Standard'}}selected{{/if_eq}} value="Standard">{{localize 'DG.Gear.Expense.Standard'}}</option>
-            <option {{#if_eq data.data.expense 'Unusual'}}selected{{/if_eq}} value="Unusual">{{localize 'DG.Gear.Expense.Unusual'}}</option>
-            <option {{#if_eq data.data.expense 'Major'}}selected{{/if_eq}} value="Major">{{localize 'DG.Gear.Expense.Major'}}</option>
-            <option {{#if_eq data.data.expense 'Extreme'}}selected{{/if_eq}} value="Extreme">{{localize 'DG.Gear.Expense.Extreme'}}</option>
+          <select name="system.expense" >
+            <option {{#if_eq system.expense 'Incidental'}}selected{{/if_eq}} value="Incidental">{{localize 'DG.Gear.Expense.Incidental'}}</option>
+            <option {{#if_eq system.expense 'Standard'}}selected{{/if_eq}} value="Standard">{{localize 'DG.Gear.Expense.Standard'}}</option>
+            <option {{#if_eq system.expense 'Unusual'}}selected{{/if_eq}} value="Unusual">{{localize 'DG.Gear.Expense.Unusual'}}</option>
+            <option {{#if_eq system.expense 'Major'}}selected{{/if_eq}} value="Major">{{localize 'DG.Gear.Expense.Major'}}</option>
+            <option {{#if_eq system.expense 'Extreme'}}selected{{/if_eq}} value="Extreme">{{localize 'DG.Gear.Expense.Extreme'}}</option>
           </select>
 
           <span class="resource-label">{{localize 'DG.ItemWindow.Gear.Equipped'}}:</span>
-          <input class="labeled-resource-checkbox" type="checkbox" name="data.equipped" {{checked data.data.equipped}} data-dtype="Boolean" />
+          <input class="labeled-resource-checkbox" type="checkbox" name="system.equipped" {{checked system.equipped}} data-dtype="Boolean" />
 
         </div>
       </div>
@@ -29,57 +29,57 @@
         <div class="weapon-sheet-horizontal-grid-left-2col">
 
           <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.Skill'}}:</span>
-          <select name="data.skill" >
-              <option {{#if_eq data.data.skill 'firearms'}}selected{{/if_eq}} value="firearms">{{localize 'DG.Skills.firearms'}}</option>
-              <option {{#if_eq data.data.skill 'melee_weapons'}}selected{{/if_eq}} value="melee_weapons">{{localize 'DG.Skills.melee_weapons'}}</option>
-              <option {{#if_eq data.data.skill 'unarmed_combat'}}selected{{/if_eq}} value="unarmed_combat">{{localize 'DG.Skills.unarmed_combat'}}</option>
-              <option {{#if_eq data.data.skill 'heavy_weapons'}}selected{{/if_eq}} value="heavy_weapons">{{localize 'DG.Skills.heavy_weapons'}}</option>
-              <option {{#if_eq data.data.skill 'athletics'}}selected{{/if_eq}} value="athletics">{{localize 'DG.Skills.athletics'}}</option>
-              <option {{#if_eq data.data.skill 'demolitions'}}selected{{/if_eq}} value="demolitions">{{localize 'DG.Skills.demolitions'}}</option>
-              <option {{#if_eq data.data.skill 'artillery'}}selected{{/if_eq}} value="artillery">{{localize 'DG.Skills.artillery'}}</option>
-              <option {{#if_eq data.data.skill 'str'}}selected{{/if_eq}} value="str">{{localize 'DG.Attributes.str'}}x5</option>
-              <option {{#if_eq data.data.skill 'con'}}selected{{/if_eq}} value="con">{{localize 'DG.Attributes.con'}}x5</option>
-              <option {{#if_eq data.data.skill 'dex'}}selected{{/if_eq}} value="dex">{{localize 'DG.Attributes.dex'}}x5</option>
-              <option {{#if_eq data.data.skill 'int'}}selected{{/if_eq}} value="int">{{localize 'DG.Attributes.int'}}x5</option>
-              <option {{#if_eq data.data.skill 'pow'}}selected{{/if_eq}} value="pow">{{localize 'DG.Attributes.pow'}}x5</option>
-              <option {{#if_eq data.data.skill 'cha'}}selected{{/if_eq}} value="cha">{{localize 'DG.Attributes.cha'}}x5</option>
+          <select name="system.skill" >
+              <option {{#if_eq system.skill 'firearms'}}selected{{/if_eq}} value="firearms">{{localize 'DG.Skills.firearms'}}</option>
+              <option {{#if_eq system.skill 'melee_weapons'}}selected{{/if_eq}} value="melee_weapons">{{localize 'DG.Skills.melee_weapons'}}</option>
+              <option {{#if_eq system.skill 'unarmed_combat'}}selected{{/if_eq}} value="unarmed_combat">{{localize 'DG.Skills.unarmed_combat'}}</option>
+              <option {{#if_eq system.skill 'heavy_weapons'}}selected{{/if_eq}} value="heavy_weapons">{{localize 'DG.Skills.heavy_weapons'}}</option>
+              <option {{#if_eq system.skill 'athletics'}}selected{{/if_eq}} value="athletics">{{localize 'DG.Skills.athletics'}}</option>
+              <option {{#if_eq system.skill 'demolitions'}}selected{{/if_eq}} value="demolitions">{{localize 'DG.Skills.demolitions'}}</option>
+              <option {{#if_eq system.skill 'artillery'}}selected{{/if_eq}} value="artillery">{{localize 'DG.Skills.artillery'}}</option>
+              <option {{#if_eq system.skill 'str'}}selected{{/if_eq}} value="str">{{localize 'DG.Attributes.str'}}x5</option>
+              <option {{#if_eq system.skill 'con'}}selected{{/if_eq}} value="con">{{localize 'DG.Attributes.con'}}x5</option>
+              <option {{#if_eq system.skill 'dex'}}selected{{/if_eq}} value="dex">{{localize 'DG.Attributes.dex'}}x5</option>
+              <option {{#if_eq system.skill 'int'}}selected{{/if_eq}} value="int">{{localize 'DG.Attributes.int'}}x5</option>
+              <option {{#if_eq system.skill 'pow'}}selected{{/if_eq}} value="pow">{{localize 'DG.Attributes.pow'}}x5</option>
+              <option {{#if_eq system.skill 'cha'}}selected{{/if_eq}} value="cha">{{localize 'DG.Attributes.cha'}}x5</option>
           </select>                              
 
           <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.IsLethality'}}:</span>
-          <input class="labeled-resource-checkbox" type="checkbox" name="data.isLethal" {{checked data.data.isLethal}} data-dtype="Boolean" 
+          <input class="labeled-resource-checkbox" type="checkbox" name="system.isLethal" {{checked system.isLethal}} data-dtype="Boolean" 
               title="{{localize 'DG.ItemWindow.Weapons.IsLethalityTooltip'}}"
           />
 
           <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.KillRadius'}}:</span>
-          <input type="text" name="data.killRadius" value="{{data.data.killRadius}}" data-dtype="String"/>
+          <input type="text" name="system.killRadius" value="{{system.killRadius}}" data-dtype="String"/>
           
         </div>
 
         <div class="weapon-sheet-horizontal-grid-right-2col">
         
           <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.Range'}}:</span>
-          <input type="text" name="data.range" value="{{data.data.range}}" data-dtype="String"/>
+          <input type="text" name="system.range" value="{{system.range}}" data-dtype="String"/>
 
           {{!-- If a weapon is 'Lethal', need to show the d100% Lethality input, otherwise only show the regular Damage formula (e.g. 1D6, 1D4+2, etc...) --}}
 
-          {{#unless data.data.isLethal}}
+          {{#unless system.isLethal}}
           
             <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.Damage'}}:</span>
-            <input type="text" name="data.damage" value="{{data.data.damage}}" data-dtype="String"/>
+            <input type="text" name="system.damage" value="{{system.damage}}" data-dtype="String"/>
           
           {{/unless}}
 
-          {{#if data.data.isLethal}}
+          {{#if system.isLethal}}
           
             <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.Lethality'}} %:</span>
-            <input class="" type="text" name="data.lethality" value="{{data.data.lethality}}" data-dtype="Number"
+            <input class="" type="text" name="system.lethality" value="{{system.lethality}}" data-dtype="Number"
               title="{{localize 'DG.ItemWindow.Weapons.LethalityTooltip'}}"
             />
           
           {{/if}}
           
           <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.ArmorPiercing'}}:</span>
-          <input type="text" name="data.armorPiercing" value="{{data.data.armorPiercing}}" data-dtype="Number"/>
+          <input type="text" name="system.armorPiercing" value="{{system.armorPiercing}}" data-dtype="Number"/>
  
         </div>
 
@@ -87,7 +87,7 @@
       
       <div class="weapon-sheet-secondary-grid-2col">
         <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.Ammo'}}:</span>
-        <input type="text" name="data.ammo" value="{{data.data.ammo}}" data-dtype="String"/>
+        <input type="text" name="system.ammo" value="{{system.ammo}}" data-dtype="String"/>
       </div>
          
     </header>
@@ -103,7 +103,7 @@
 
         {{!-- Description Tab --}}
         <div class="tab" data-group="primary" data-tab="description">
-            {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
+            {{editor system.description target="system.description" button=true owner=owner editable=editable}}
         </div>
     </section>
 </form>