diff --git a/module/actor/actor-sheet.js b/module/actor/actor-sheet.js
index a40bd199..c1cfa211 100644
--- a/module/actor/actor-sheet.js
+++ b/module/actor/actor-sheet.js
@@ -531,7 +531,7 @@ export class ExaltedThirdActorSheet extends ActorSheet {
       endings: 0,
     }
     // Iterate through items, allocating to containers
-    for (let i of sheetData.items) {
+    for (let i of actorData.items) {
       i.img = i.img || DEFAULT_TOKEN;
       if (i.type === 'item') {
         gear.push(i);
diff --git a/module/actor/actor.js b/module/actor/actor.js
index 3979584d..eaeb58e3 100644
--- a/module/actor/actor.js
+++ b/module/actor/actor.js
@@ -1645,7 +1645,7 @@ export async function spendEmbeddedItem(actor, item) {
             }
           }
         }
-        if (item.system.cost.commitmotes > 0) {
+        if (item.system.cost.commitmotes > 0 || item.system.activatable) {
           updateActive = true;
         }
       }
diff --git a/module/apps/dice-roller.js b/module/apps/dice-roller.js
index b39e0ea0..0d8335fd 100644
--- a/module/apps/dice-roller.js
+++ b/module/apps/dice-roller.js
@@ -1045,7 +1045,7 @@ export class RollForm extends FormApplication {
             case 'opposedRolls':
                 return (this.object.rollType === 'useOpposingCharms');
             case 'sameAbility':
-                return (charm.system.ability === this.object.ability || charm.system.ability === this.object.attribute);
+                return charm.type === 'charm' && (charm.system.ability === this.object.ability || charm.system.ability === this.object.attribute);
         }
         if (this.object.rollType === charm.system.autoaddtorolls) {
             return true;
@@ -1065,7 +1065,7 @@ export class RollForm extends FormApplication {
         }
         for (var charmlist of Object.values(this.object.charmList)) {
             for (const charm of charmlist.list.filter(charm => charm.type !== 'charm' || charm.system.diceroller.enabled)) {
-                var existingAddedCharm = this.object.addedCharms.find((addedCharm) => addedCharm.id === charm._id);
+                var existingAddedCharm = this.object.addedCharms.find((addedCharm) => addedCharm._id === charm._id);
                 if (existingAddedCharm) {
                     charm.charmAdded = true;
                     charm.timesAdded = existingAddedCharm.timesAdded;
@@ -3044,7 +3044,7 @@ export class RollForm extends FormApplication {
         else {
             this.object.thresholdSuccesses = 0;
         }
-        if ((this.object.thresholdSuccesses >= 0 && this.object.rollType !== 'accuracy') || this.object.rollType === 'damage') {
+        if (this.object.rollType === 'damage' || (this.object.attackSuccesses >= this.object.defense && this.object.rollType !== 'accuracy')) {
             if (this.object.rollType === 'damage' && this.object.attackSuccesses < this.object.defense) {
                 this.object.thresholdSuccesses = this.object.attackSuccesses - this.object.defense;
                 await this.missAttack(false);
@@ -3052,11 +3052,10 @@ export class RollForm extends FormApplication {
             else {
                 await this._damageRoll();
                 await this._addTriggerBonuses('afterDamageRoll');
-
             }
         }
         else {
-            if (this.object.thresholdSuccesses < 0 && this.object.rollType !== 'accuracy') {
+            if (this.object.attackSuccesses < this.object.defense && this.object.rollType !== 'accuracy') {
                 await this.missAttack();
             }
         }
diff --git a/module/apps/npc-generator.js b/module/apps/npc-generator.js
index 9845d498..b1f8162c 100644
--- a/module/apps/npc-generator.js
+++ b/module/apps/npc-generator.js
@@ -108,7 +108,8 @@ export default class NPCGenerator extends FormApplication {
       height: 1100,
       resizable: true,
       submitOnChange: true,
-      closeOnSubmit: false
+      closeOnSubmit: false,
+      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "stats" }]
     });
   }
 
diff --git a/module/config.js b/module/config.js
index 90f67530..4694a4ff 100644
--- a/module/config.js
+++ b/module/config.js
@@ -322,6 +322,7 @@ exaltedthird.exaltcharmtypes = {
   solar: "Ex3.Solar",
   sovereign: "Ex3.Sovereign",
   umbral: "Ex3.Umbral",
+  universal: "Ex3.Universal",
   other: "Ex3.Other"
 };
 
@@ -1842,7 +1843,7 @@ exaltedthird.selects = {
     '': "Ex3.None",
     'action': "Ex3.CharacterRolls",
     'opposedRolls': "Ex3.OpposedRolls",
-    'sameAbility': "Ex3.NonSameAbilityAttribute",
+    'sameAbility': "Ex3.SameAbilityAttribute",
     'attacks': "Ex3.Attacks",
     'command': "Ex3.Command",
     'grapple': "Ex3.Grapple",
diff --git a/module/item/item-sheet.js b/module/item/item-sheet.js
index a5cb7c2d..ea7bdda3 100644
--- a/module/item/item-sheet.js
+++ b/module/item/item-sheet.js
@@ -284,7 +284,7 @@ export class ExaltedThirdItemSheet extends ItemSheet {
     html.find('.show-roll-triggers-link').click(ev => {
       new Dialog({
         title: `ReadMe`,
-        content: '<div><p><a href="https://github.com/Aliharu/Foundry-Ex3/wiki/Charm-Triggers">Instructions and Syntax.</a></p></div>',
+        content: '<div><p><a href="https://github.com/Aliharu/Foundry-Ex3/wiki/Dice-Roll-Triggers">Instructions and Syntax.</a></p></div>',
         buttons: {
           cancel: { label: "Close" }
         }
diff --git a/module/template/item-template.js b/module/template/item-template.js
index 82355765..990c7d5d 100644
--- a/module/template/item-template.js
+++ b/module/template/item-template.js
@@ -173,6 +173,7 @@ export class ItemMeritData extends CommonItemData {
             ...commonData,
             ...activatableData(),
             ...triggerData(),
+            autoaddtorolls: new fields.StringField({ initial: "" }),
             merittype: new fields.StringField({ initial: "story" }),
             parentitemid: new fields.StringField({ initial: "" }),
             archetypename: new fields.StringField({ initial: "" }),
@@ -251,6 +252,7 @@ export class ItemSpecialAbilityData extends CommonItemData {
             ...commonData,
             ...activatableData(),
             ...triggerData(),
+            autoaddtorolls: new fields.StringField({ initial: "" }),
         }
     }
 }
@@ -344,6 +346,7 @@ export class ItemSpellData extends CommonItemData {
             ...commonData,
             ...activatableData(),
             ...triggerData(),
+            autoaddtorolls: new fields.StringField({ initial: "" }),
             summary: new fields.StringField({ initial: "" }),
             circle: new fields.StringField({ initial: "terrestrial" }),
             keywords: new fields.StringField({ initial: "" }),
diff --git a/system.json b/system.json
index 78084790..34033e4f 100644
--- a/system.json
+++ b/system.json
@@ -4,7 +4,7 @@
   "description": "Unofficial Exalted third edition system module for FoundryVTT!  Portions of the materials are the copyrights and trademarks of Paradox Interactive AB, and are used with permission. All rights reserved. For more information please visit worldofdarkness.com.",
   "url": "https://github.com/Aliharu/Foundry-Ex3",
   "license": "LICENSE.txt",
-  "version": "2.9.3",
+  "version": "2.9.4",
   "compatibility": {
     "minimum": "11",
     "verified": "12",
@@ -49,7 +49,7 @@
   ],
   "relationships": [],
   "manifest": "https://raw.githubusercontent.com/Aliharu/Foundry-Ex3/master/system.json",
-  "download": "https://github.com/Aliharu/Foundry-Ex3/releases/download/v2.9.3/release2.9.3.zip",
+  "download": "https://github.com/Aliharu/Foundry-Ex3/releases/download/v2.9.4/release2.9.4.zip",
   "bugs": "https://github.com/Aliharu/Foundry-Ex3/issues",
   "gridDistance": 5,
   "gridUnits": "ft",
diff --git a/templates/actor/npc-sheet.html b/templates/actor/npc-sheet.html
index 230a23ec..062a83be 100644
--- a/templates/actor/npc-sheet.html
+++ b/templates/actor/npc-sheet.html
@@ -347,6 +347,17 @@ <h4 class="item-name">{{item.name}}</h4>
                     {{/each}}
                 </div>
             </div>
+            <div class="mt-1">
+                <label class="resource-label">{{localize "Ex3.Languages"}}</label>
+                <a class="trait-selector" data-options="languages" data-target="system.traits.languages">
+                  <i class="fas fa-edit"></i>
+                </a>
+                <div class="mt-1">
+                  {{#each system.traits.languages.selected as |v k|}}
+                  <li class="tag {{k}}">{{v}}</li>
+                  {{/each}}
+                </div>
+              </div>
             {{> systems/exaltedthird/templates/actor/biography-tab.html}}
         </div>
     </section>
diff --git a/templates/dialogues/npc-generator.html b/templates/dialogues/npc-generator.html
index 0a0f3def..fa479156 100644
--- a/templates/dialogues/npc-generator.html
+++ b/templates/dialogues/npc-generator.html
@@ -1,222 +1,245 @@
 <div class="exaltedthird">
   <form>
-    <div class="resource flex-center mb-2 mt-2">
-      <div>
-        <label class="resource-label">{{localize "Ex3.Name"}} <a><i id="randomName"
-              class="fas fa-dice cursor-pointer"></i></a></label>
-        <input name="object.character.name" value="{{data.character.name}}" type="text"
-          placeholder="{{data.character.defaultName}}">
+    <header>
+      <div class="resource flex-center mb-2 mt-2">
+        <div>
+          <label class="resource-label">{{localize "Ex3.Name"}} <a><i id="randomName"
+                class="fas fa-dice cursor-pointer"></i></a></label>
+          <input name="object.character.name" value="{{data.character.name}}" type="text"
+            placeholder="{{data.character.defaultName}}">
+        </div>
+      </div>
+      {{#ifEquals data.characterType 'npc'}}
+      <div class="resource-content flexrow flex-center flex-between mt-2">
+        <label class="resource-label" style="font-size: 24px;">{{localize "Ex3.NPC"}}</label>
+      </div>
+      <div class="resource grid grid-4col flex-center mb-2 mt-2">
+        <div>
+          <div class="resource-label">{{localize "Ex3.Template"}}</div>
+          <select id="template" name="object.template" value="{{data.template}}" data-type="String">
+            {{selectOptions data.selects.npcTemplates selected=data.template localize=true}}
+          </select>
+        </div>
+        <div>
+          <div class="resource-label">{{localize "Ex3.PoolNumbers"}}</div>
+          <select name="object.poolNumbers" value="{{data.poolNumbers}}" data-type="String">
+            {{selectOptions data.selects.poolNumberTypes selected=data.poolNumbers localize=true}}
+          </select>
+        </div>
+        <div>
+          <div class="resource-label">{{localize "Ex3.NPCType"}}</div>
+          <select class="rerender" name="object.character.npcType" data-type="String">
+            {{selectOptions data.selects.creatureTypes selected=data.character.npcType localize=true}}
+          </select>
+        </div>
+        <div>
+          <label class="resource-label">{{localize "Ex3.Essence"}} </label>
+          <input name="object.character.essence" value="{{data.character.essence}}" type="number">
+        </div>
+      </div>
+      {{/ifEquals}}
+      {{#ifEquals data.character.npcType 'exalt'}}
+      <div class="resource-content flexrow flex-center flex-between">
+        <label class="resource-label" style="font-size: 24px;">{{localize "Ex3.Exalt"}}</label>
+      </div>
+      <div class="resource grid grid-2col flex-center">
+        <div>
+          <div class="resource-label">{{localize "Ex3.Exalt"}}</div>
+          <select id="exalt" name="object.character.exalt" data-type="String">
+            {{selectOptions data.selects.exaltTypes selected=data.character.exalt localize=true}}
+          </select>
+        </div>
+        {{#if data.availableCastes}}
+        <div>
+          <div class="resource-label">{{localize "Ex3.Caste"}}/{{localize "Ex3.Aspect"}}</div>
+          <select name="object.character.caste" data-type="String">
+            {{selectOptions data.availableCastes selected=data.character.caste localize=true}}
+          </select>
+        </div>
+        {{/if}}
+      </div>
+      {{/ifEquals}}
+    </header>
+
+    <nav class="sheet-tabs tabs" data-group="primary">
+      <a class="item" data-tab="stats">{{localize "Ex3.Stats"}}</a>
+      <a class="item" data-tab="equipment">{{localize "Ex3.Equipment"}}</a>
+    </nav>
+
+    <section class="sheet-body">
+      <div class="tab" data-group="primary" data-tab="stats">
+        {{#ifEquals data.characterType 'npc'}}
+        <div class="resource-content flexrow flex-center flex-between mt-2">
+          <label class="resource-label" style="font-size: 24px;">{{localize "Ex3.Skills"}}</label>
+        </div>
+        <div class="resource grid grid-4col flex-center">
+          {{#each data.character.skills as |skill key|}}
+          <div>
+            <div class="resource-label">{{localize skill.label}}</div>
+            <select name="object.character.skills.{{key}}.value" data-type="String">
+              {{selectOptions ../data.selects.skillLevels selected=skill.value localize=true}}
+            </select>
+          </div>
+          {{/each}}
+        </div>
+        <div class="resource-content flexrow flex-center flex-between mt-2">
+          <label class="resource-label" style="font-size: 24px;">{{localize "Ex3.Traits"}}</label>
+        </div>
+        <div class="resource grid grid-4col flex-center">
+          <div>
+            <div class="resource-label">{{localize "Ex3.Sorcerer"}}</div>
+            <select name="object.character.sorcerer" data-type="String">
+              {{selectOptions data.selects.allSpellCircles selected=data.character.sorcerer localize=true blank=""}}
+            </select>
+          </div>
+          <div>
+            <div class="resource-label">{{localize "Ex3.SizeCategory"}}</div>
+            <select name="object.character.sizeCategory" data-type="String">
+              {{selectOptions data.selects.sizeCategory selected=data.character.sizeCategory localize=true}}
+            </select>
+          </div>
+          {{#each data.character.numberTraits as |trait key|}}
+          <div>
+            <label class="resource-label">{{localize trait.label}}</label>
+            <input name="object.character.numberTraits.{{key}}.value" value="{{trait.value}}" type="number">
+          </div>
+          {{/each}}
+          <div>
+            <div class="resource-label">{{localize "Ex3.Battlegroup"}}</div>
+            <input class="rerender" name="object.character.battlegroup" type="checkbox" {{checked
+              data.character.battlegroup}}>
+          </div>
+          {{#each data.character.traits as |trait key|}}
+          <div>
+            <div class="resource-label">{{localize trait.label}}</div>
+            <input name="object.character.traits.{{key}}.value" type="checkbox" {{checked trait.value}}>
+          </div>
+          {{/each}}
+        </div>
+        {{#if data.character.battlegroup}}
+        <div class="resource-content flexrow flex-center flex-between mt-2">
+          <label class="resource-label" style="font-size: 24px;">{{localize "Ex3.Battlegroup"}}</label>
+        </div>
+        <div class="resource grid grid-4col flex-center">
+          <div>
+            <label class="resource-label">{{localize "Ex3.Drill"}}</label>
+            <div class="charname"> <select name="object.character.battlegroupStats.drill"
+                value="{{data.character.battlegroupStats.drill}}" data-type="String">
+                {{selectOptions data.selects.drill selected=data.character.battlegroupStats.drill localize=true}}
+              </select></div>
+          </div>
+          <div>
+            <label class="resource-label">{{localize "Ex3.Size"}}</label>
+            <input type="number" name="object.character.battlegroupStats.size"
+              value="{{data.character.battlegroupStats.size}}" data-dtype="Number" />
+          </div>
+          <div>
+            <label class="resource-label">{{localize "Ex3.Might"}}</label>
+            <input type="number" name="object.character.battlegroupStats.might"
+              value="{{data.character.battlegroupStats.might}}" data-dtype="Number" />
+          </div>
+        </div>
+        {{/if}}
+        <!-- <div class="resource-content flexrow flex-center flex-between mt-2">
+          <label class="resource-label" style="font-size: 24px;">{{localize "Ex3.HomebrewContent"}}</label>
+        </div>
+        <div class="resource grid grid-4col flex-center">
+          <div>
+            <label class="resource-label">{{localize "Ex3.SpecialAbilities"}}</label>
+            <input name="object.character.homebew.specialAbilities" value="{{data.character.homebrew.specialAbilities}}"
+              type="number">
+          </div>
+        </div> -->
+        {{/ifEquals}}
+      </div>
+
+      <div class="tab" data-group="primary" data-tab="equipment">
+        <div class="resource-content flexrow flex-center flex-between mt-2">
+          <label class="resource-label" style="font-size: 24px;">{{localize "Ex3.PrimaryWeapon"}}</label>
+        </div>
+        <div class="resource grid grid-4col flex-center">
+          <div>
+            <div class="resource-label">{{localize "Ex3.Type"}}</div>
+            <select class="rerender" name="object.character.equipment.primaryWeapon.type" data-type="String">
+              {{selectOptions data.selects.npcItemCategory selected=data.character.equipment.primaryWeapon.type
+              localize=true}}
+            </select>
+          </div>
+          <div>
+            <div class="resource-label">{{localize "Ex3.Type"}}</div>
+            <select name="object.character.equipment.primaryWeapon.weaponType" data-type="String">
+              {{selectOptions data.selects.npcWeaponType selected=data.character.equipment.primaryWeapon.weaponType
+              localize=true}}
+            </select>
+          </div>
+          <div>
+            <div class="resource-label">{{localize "Ex3.Weight"}}</div>
+            <select name="object.character.equipment.primaryWeapon.weight" data-type="String">
+              {{selectOptions data.selects.npcWeaponWeight selected=data.character.equipment.primaryWeapon.weight
+              localize=true}}
+            </select>
+          </div>
+          <div>
+            <div class="resource-label">{{localize "Ex3.Artifact"}}</div>
+            <input name="object.character.equipment.primaryWeapon.artifact" type="checkbox" {{checked
+              data.character.equipment.primaryWeapon.artifact}}>
+          </div>
+        </div>
+        <div class="resource-content flexrow flex-center flex-between mt-2">
+          <label class="resource-label" style="font-size: 24px;">{{localize "Ex3.SecondaryWeapon"}}</label>
+        </div>
+        <div class="resource grid grid-4col flex-center">
+          <div>
+            <div class="resource-label">{{localize "Ex3.Type"}}</div>
+            <select class="rerender" name="object.character.equipment.secondaryWeapon.type" data-type="String">
+              {{selectOptions data.selects.npcItemCategory selected=data.character.equipment.secondaryWeapon.type
+              localize=true}}
+            </select>
+          </div>
+          <div>
+            <div class="resource-label">{{localize "Ex3.WeaponType"}}</div>
+            <select name="object.character.equipment.secondaryWeapon.weaponType" data-type="String">
+              {{selectOptions data.selects.npcWeaponType selected=data.character.equipment.secondaryWeapon.weaponType
+              localize=true}}
+            </select>
+          </div>
+          <div>
+            <div class="resource-label">{{localize "Ex3.Weight"}}</div>
+            <select name="object.character.equipment.secondaryWeapon.weight" data-type="String">
+              {{selectOptions data.selects.npcWeaponWeight selected=data.character.equipment.secondaryWeapon.weight
+              localize=true}}
+            </select>
+          </div>
+          <div>
+            <div class="resource-label">{{localize "Ex3.Artifact"}}</div>
+            <input name="object.character.equipment.secondaryWeapon.artifact" type="checkbox" {{checked
+              data.character.equipment.secondaryWeapon.artifact}}>
+          </div>
+        </div>
+        <div class="resource-content flexrow flex-center flex-between mt-2">
+          <label class="resource-label" style="font-size: 24px;">{{localize "Ex3.Armor"}}</label>
+        </div>
+        <div class="resource grid grid-3col flex-center">
+          <div>
+            <div class="resource-label">{{localize "Ex3.Type"}}</div>
+            <select class="rerender" name="object.character.equipment.armor.type" data-type="String">
+              {{selectOptions data.selects.npcItemCategory selected=data.character.equipment.armor.type localize=true}}
+            </select>
+          </div>
+          <div>
+            <div class="resource-label">{{localize "Ex3.Weight"}}</div>
+            <select name="object.character.equipment.armor.weight" data-type="String">
+              {{selectOptions data.selects.npcArmorType selected=data.character.equipment.armor.weight localize=true}}
+            </select>
+          </div>
+          <div>
+            <div class="resource-label">{{localize "Ex3.Artifact"}}</div>
+            <input name="object.character.equipment.armor.artifact" type="checkbox" {{checked
+              data.character.equipment.armor.artifact}}>
+          </div>
+        </div>
       </div>
-    </div>
-    {{#ifEquals data.characterType 'npc'}}
-    <div class="resource-content flexrow flex-center flex-between mt-2">
-      <label class="resource-label" style="font-size: 24px;">{{localize "Ex3.NPC"}}</label>
-    </div>
-    <div class="resource grid grid-3col flex-center mb-2 mt-2">
-      <div>
-        <div class="resource-label">{{localize "Ex3.Template"}}</div>
-        <select id="template" name="object.template" value="{{data.template}}" data-type="String">
-          {{selectOptions data.selects.npcTemplates selected=data.template localize=true}}
-        </select>
-      </div>
-      <div>
-        <div class="resource-label">{{localize "Ex3.PoolNumbers"}}</div>
-        <select name="object.poolNumbers" value="{{data.poolNumbers}}" data-type="String">
-          {{selectOptions data.selects.poolNumberTypes selected=data.poolNumbers localize=true}}
-        </select>
-      </div>
-      <div>
-        <div class="resource-label">{{localize "Ex3.NPCType"}}</div>
-        <select name="object.character.npcType" data-type="String">
-          {{selectOptions data.selects.creatureTypes selected=data.character.npcType localize=true}}
-        </select>
-      </div>
-    </div>
-    {{/ifEquals}}
-    <div class="resource-content flexrow flex-center flex-between">
-      <label class="resource-label" style="font-size: 24px;">{{localize "Ex3.Description"}}</label>
-    </div>
-    <div class="resource grid grid-3col flex-center">
-      <div>
-        <div class="resource-label">{{localize "Ex3.Exalt"}}</div>
-        <select id="exalt" name="object.character.exalt" data-type="String">
-          {{selectOptions data.selects.exaltTypes selected=data.character.exalt localize=true}}
-        </select>
-      </div>
-      {{#if data.availableCastes}}
-      <div>
-        <div class="resource-label">{{localize "Ex3.Caste"}}/{{localize "Ex3.Aspect"}}</div>
-        <select name="object.character.caste" data-type="String">
-          {{selectOptions data.availableCastes selected=data.character.caste localize=true}}
-        </select>
-      </div>
-      {{/if}}
-      <div>
-        <label class="resource-label">{{localize "Ex3.Essence"}} </label>
-        <input name="object.character.essence" value="{{data.character.essence}}" type="number">
-      </div>
-    </div>
-    {{#ifEquals data.characterType 'npc'}}
-    <div class="resource-content flexrow flex-center flex-between mt-2">
-      <label class="resource-label" style="font-size: 24px;">{{localize "Ex3.Skills"}}</label>
-    </div>
-    <div class="resource grid grid-4col flex-center">
-      {{#each data.character.skills as |skill key|}}
-      <div>
-        <div class="resource-label">{{localize skill.label}}</div>
-        <select name="object.character.skills.{{key}}.value" data-type="String">
-          {{selectOptions ../data.selects.skillLevels selected=skill.value localize=true}}
-        </select>
-      </div>
-      {{/each}}
-    </div>
-    <div class="resource-content flexrow flex-center flex-between mt-2">
-      <label class="resource-label" style="font-size: 24px;">{{localize "Ex3.Traits"}}</label>
-    </div>
-    <div class="resource grid grid-4col flex-center">
-      <div>
-        <div class="resource-label">{{localize "Ex3.Sorcerer"}}</div>
-        <select name="object.character.sorcerer" data-type="String">
-          {{selectOptions data.selects.allSpellCircles selected=data.character.sorcerer localize=true blank=""}}
-        </select>
-      </div>
-      <div>
-        <div class="resource-label">{{localize "Ex3.SizeCategory"}}</div>
-        <select name="object.character.sizeCategory" data-type="String">
-          {{selectOptions data.selects.sizeCategory selected=data.character.sizeCategory localize=true}}
-        </select>
-      </div>
-      {{#each data.character.numberTraits as |trait key|}}
-      <div>
-        <label class="resource-label">{{localize trait.label}}</label>
-        <input name="object.character.numberTraits.{{key}}.value" value="{{trait.value}}" type="number">
-      </div>
-      {{/each}}
-      <div>
-        <div class="resource-label">{{localize "Ex3.Battlegroup"}}</div>
-        <input class="rerender" name="object.character.battlegroup" type="checkbox" {{checked
-          data.character.battlegroup}}>
-      </div>
-      {{#each data.character.traits as |trait key|}}
-      <div>
-        <div class="resource-label">{{localize trait.label}}</div>
-        <input name="object.character.traits.{{key}}.value" type="checkbox" {{checked trait.value}}>
-      </div>
-      {{/each}}
-    </div>
-    {{#if data.character.battlegroup}}
-    <div class="resource-content flexrow flex-center flex-between mt-2">
-      <label class="resource-label" style="font-size: 24px;">{{localize "Ex3.Battlegroup"}}</label>
-    </div>
-    <div class="resource grid grid-4col flex-center">
-      <div>
-        <label class="resource-label">{{localize "Ex3.Drill"}}</label>
-        <div class="charname"> <select name="object.character.battlegroupStats.drill"
-            value="{{data.character.battlegroupStats.drill}}" data-type="String">
-            {{selectOptions data.selects.drill selected=data.character.battlegroupStats.drill localize=true}}
-          </select></div>
-      </div>
-      <div>
-        <label class="resource-label">{{localize "Ex3.Size"}}</label>
-        <input type="number" name="object.character.battlegroupStats.size"
-          value="{{data.character.battlegroupStats.size}}" data-dtype="Number" />
-      </div>
-      <div>
-        <label class="resource-label">{{localize "Ex3.Might"}}</label>
-        <input type="number" name="object.character.battlegroupStats.might"
-          value="{{data.character.battlegroupStats.might}}" data-dtype="Number" />
-      </div>
-    </div>
-    {{/if}}
-    <!-- <div class="resource-content flexrow flex-center flex-between mt-2">
-      <label class="resource-label" style="font-size: 24px;">{{localize "Ex3.HomebrewContent"}}</label>
-    </div>
-    <div class="resource grid grid-4col flex-center">
-      <div>
-        <label class="resource-label">{{localize "Ex3.SpecialAbilities"}}</label>
-        <input name="object.character.homebew.specialAbilities" value="{{data.character.homebrew.specialAbilities}}"
-          type="number">
-      </div>
-    </div> -->
-    {{/ifEquals}}
-    <div class="resource-content flexrow flex-center flex-between mt-2">
-      <label class="resource-label" style="font-size: 24px;">{{localize "Ex3.PrimaryWeapon"}}</label>
-    </div>
-    <div class="resource grid grid-4col flex-center">
-      <div>
-        <div class="resource-label">{{localize "Ex3.Type"}}</div>
-        <select class="rerender" name="object.character.equipment.primaryWeapon.type" data-type="String">
-          {{selectOptions data.selects.npcItemCategory selected=data.character.equipment.primaryWeapon.type localize=true}}
-        </select>
-      </div>
-      <div>
-        <div class="resource-label">{{localize "Ex3.Type"}}</div>
-        <select name="object.character.equipment.primaryWeapon.weaponType" data-type="String">
-          {{selectOptions data.selects.npcWeaponType selected=data.character.equipment.primaryWeapon.weaponType localize=true}}
-        </select>
-      </div>
-      <div>
-        <div class="resource-label">{{localize "Ex3.Weight"}}</div>
-        <select name="object.character.equipment.primaryWeapon.weight" data-type="String">
-          {{selectOptions data.selects.npcWeaponWeight selected=data.character.equipment.primaryWeapon.weight localize=true}}
-        </select>
-      </div>
-      <div>
-        <div class="resource-label">{{localize "Ex3.Artifact"}}</div>
-        <input name="object.character.equipment.primaryWeapon.artifact" type="checkbox" {{checked
-          data.character.equipment.primaryWeapon.artifact}}>
-      </div>
-    </div>
-    <div class="resource-content flexrow flex-center flex-between mt-2">
-      <label class="resource-label" style="font-size: 24px;">{{localize "Ex3.SecondaryWeapon"}}</label>
-    </div>
-    <div class="resource grid grid-4col flex-center">
-      <div>
-        <div class="resource-label">{{localize "Ex3.Type"}}</div>
-        <select class="rerender" name="object.character.equipment.secondaryWeapon.type" data-type="String">
-          {{selectOptions data.selects.npcItemCategory selected=data.character.equipment.secondaryWeapon.type localize=true}}
-        </select>
-      </div>
-      <div>
-        <div class="resource-label">{{localize "Ex3.WeaponType"}}</div>
-        <select name="object.character.equipment.secondaryWeapon.weaponType" data-type="String">
-          {{selectOptions data.selects.npcWeaponType selected=data.character.equipment.secondaryWeapon.weaponType localize=true}}
-        </select>
-      </div>
-      <div>
-        <div class="resource-label">{{localize "Ex3.Weight"}}</div>
-        <select name="object.character.equipment.secondaryWeapon.weight" data-type="String">
-          {{selectOptions data.selects.npcWeaponWeight selected=data.character.equipment.secondaryWeapon.weight localize=true}}
-        </select>
-      </div>
-      <div>
-        <div class="resource-label">{{localize "Ex3.Artifact"}}</div>
-        <input name="object.character.equipment.secondaryWeapon.artifact" type="checkbox" {{checked
-          data.character.equipment.secondaryWeapon.artifact}}>
-      </div>
-    </div>
-    <div class="resource-content flexrow flex-center flex-between mt-2">
-      <label class="resource-label" style="font-size: 24px;">{{localize "Ex3.Armor"}}</label>
-    </div>
-    <div class="resource grid grid-3col flex-center">
-      <div>
-        <div class="resource-label">{{localize "Ex3.Type"}}</div>
-        <select class="rerender" name="object.character.equipment.armor.type" data-type="String">
-          {{selectOptions data.selects.npcItemCategory selected=data.character.equipment.armor.type localize=true}}
-        </select>
-      </div>
-      <div>
-        <div class="resource-label">{{localize "Ex3.Weight"}}</div>
-        <select name="object.character.equipment.armor.weight" data-type="String">
-          {{selectOptions data.selects.npcArmorType selected=data.character.equipment.armor.weight localize=true}}
-        </select>
-      </div>
-      <div>
-        <div class="resource-label">{{localize "Ex3.Artifact"}}</div>
-        <input name="object.character.equipment.armor.artifact" type="checkbox" {{checked
-          data.character.equipment.armor.artifact}}>
-      </div>
-    </div>
   </form>
+  </section>
   <button type="button" id="generate">{{localize "Ex3.Generate"}}</button>
 </div>
\ No newline at end of file
diff --git a/templates/item/item-merit-sheet.html b/templates/item/item-merit-sheet.html
index 890d69e0..516aaf48 100644
--- a/templates/item/item-merit-sheet.html
+++ b/templates/item/item-merit-sheet.html
@@ -29,7 +29,7 @@ <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeh
         </div>
 
         <div class="tab" data-group="primary" data-tab="effects">
-            <div class="grid grid-2col flex-group-center">
+            <div class="grid grid-3col flex-group-center">
                 <div>
                     <div class="resource-label">{{localize "Ex3.Type"}}</div>
                     <select name="system.merittype" data-type="String">
@@ -42,6 +42,12 @@ <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeh
                         {{selectOptions selects.endTriggers selected=system.endtrigger localize=true}}
                     </select>
                 </div>
+                <div>
+                    <div class="resource-label">{{localize "Ex3.AutoAddToRolls"}}</div>
+                    <select name="system.autoaddtorolls" data-type="String">
+                        {{selectOptions selects.autoAddToRollOptions selected=system.autoaddtorolls localize=true}}
+                    </select>
+                </div>
             </div>
             {{#ifEquals system.merittype 'sorcery'}}
             <div>
diff --git a/templates/item/item-specialability-sheet.html b/templates/item/item-specialability-sheet.html
index 0287b7ac..792b3c0a 100644
--- a/templates/item/item-specialability-sheet.html
+++ b/templates/item/item-specialability-sheet.html
@@ -35,6 +35,12 @@ <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeh
                         {{selectOptions selects.endTriggers selected=system.endtrigger localize=true}}
                     </select>
                 </div>
+                <div>
+                    <div class="resource-label">{{localize "Ex3.AutoAddToRolls"}}</div>
+                    <select name="system.autoaddtorolls" data-type="String">
+                        {{selectOptions selects.autoAddToRollOptions selected=system.autoaddtorolls localize=true}}
+                    </select>
+                </div>
             </div>
             {{> systems/exaltedthird/templates/actor/active-effects.html}}
         </div>
diff --git a/templates/item/item-spell-sheet.html b/templates/item/item-spell-sheet.html
index a82da3aa..afbd19b3 100644
--- a/templates/item/item-spell-sheet.html
+++ b/templates/item/item-spell-sheet.html
@@ -53,7 +53,7 @@ <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeh
                 <label class="resource-label">{{localize "Ex3.Summary"}}</label>
                 <textarea type="text" name="system.summary" rows="4">{{system.summary}}</textarea>
             </div>
-            <div class="grid grid-2col flex-group-center">
+            <div class="grid grid-3col flex-group-center">
                 <div>
                     <label class="resource-label">{{localize "Ex3.Activatable"}}</label>
                     <div>
@@ -66,6 +66,12 @@ <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeh
                         {{selectOptions selects.endTriggers selected=system.endtrigger localize=true}}
                     </select>
                 </div>
+                <div>
+                    <div class="resource-label">{{localize "Ex3.AutoAddToRolls"}}</div>
+                    <select name="system.autoaddtorolls" data-type="String">
+                        {{selectOptions selects.autoAddToRollOptions selected=system.autoaddtorolls localize=true}}
+                    </select>
+                </div>
             </div>
             {{> systems/exaltedthird/templates/actor/active-effects.html}}
         </div>