From 7cbbb3168e7cb7a48a63855423570e7fbeafda5f Mon Sep 17 00:00:00 2001
From: Dapoulp <74197441+Dapoulp@users.noreply.github.com>
Date: Sat, 19 Jul 2025 15:48:50 +0200
Subject: [PATCH 1/4] Feature/336 damage targeted resources (#376)

* Unify healing & damage

* create DHResourceData

* Damages parts roll

* h

* ChatMessage & takeDamage updates

* Adapt healing

* No, there was not a console.log !
---
 lang/en.json                                  |   8 ++
 module/applications/dialogs/damageDialog.mjs  |   6 +-
 .../dialogs/damageReductionDialog.mjs         |   6 +-
 module/applications/ui/chatLog.mjs            |  30 ++++--
 module/config/generalConfig.mjs               |   5 +
 module/data/action/actionDice.mjs             |  37 +++++--
 module/data/action/baseAction.mjs             |  24 ++---
 module/data/action/damageAction.mjs           |  39 ++++---
 module/data/action/healingAction.mjs          |  22 ++--
 module/data/actor/character.mjs               |   5 +-
 module/dice/d20Roll.mjs                       |  19 ++--
 module/dice/damageRoll.mjs                    | 101 +++++++++++++++---
 module/dice/dhRoll.mjs                        |  28 ++---
 module/dice/dualityRoll.mjs                   |  14 +--
 module/documents/actor.mjs                    |  78 ++++++++------
 module/documents/token.mjs                    |   2 +-
 module/helpers/utils.mjs                      |  12 +++
 styles/less/global/dialog.less                |  11 ++
 styles/less/global/elements.less              |   2 +-
 styles/less/ui/chat/chat.less                 |   5 +
 templates/actionTypes/damage.hbs              |  14 ++-
 templates/actionTypes/healing.hbs             |  64 ++++++-----
 .../dialogs/dice-roll/damageSelection.hbs     |  24 ++++-
 templates/ui/chat/healing-roll.hbs            |  42 ++++----
 templates/ui/chat/parts/damage-chat.hbs       |  49 +++++----
 25 files changed, 415 insertions(+), 232 deletions(-)

diff --git a/lang/en.json b/lang/en.json
index 4e9a9b11..9f929c77 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -35,6 +35,9 @@
             "Settings": {
                 "resultBased": {
                     "label": "Formula based on Hope/Fear result."
+                },
+                "applyTo": {
+                    "label": "Targeted Resource"
                 }
             },
             "TYPES": {
@@ -662,6 +665,10 @@
                 "armorStack": {
                     "name": "Armor Stack",
                     "abbreviation": "AS"
+                },
+                "fear": {
+                    "name": "Fear",
+                    "abbreviation": "FR"
                 }
             },
             "ItemResourceType": {
@@ -1252,6 +1259,7 @@
             },
             "fear": "Fear",
             "features": "Features",
+            "healing": "Healing",
             "hitPoints": {
                 "single": "Hit Point",
                 "plural": "Hit Points",
diff --git a/module/applications/dialogs/damageDialog.mjs b/module/applications/dialogs/damageDialog.mjs
index 70dcace8..1b61b96d 100644
--- a/module/applications/dialogs/damageDialog.mjs
+++ b/module/applications/dialogs/damageDialog.mjs
@@ -43,10 +43,11 @@ export default class DamageDialog extends HandlebarsApplicationMixin(Application
 
     async _prepareContext(_options) {
         const context = await super._prepareContext(_options);
+        context.config = CONFIG.DH;
         context.title = this.config.title
             ? this.config.title
             : game.i18n.localize('DAGGERHEART.EFFECTS.ApplyLocations.damageRoll.name');
-        context.extraFormula = this.config.extraFormula;
+        // context.extraFormula = this.config.extraFormula;
         context.formula = this.roll.constructFormula(this.config);
         context.directDamage = this.config.directDamage;
         context.selectedRollMode = this.config.selectedRollMode;
@@ -55,13 +56,12 @@ export default class DamageDialog extends HandlebarsApplicationMixin(Application
             label,
             icon
         }));
-
         return context;
     }
 
     static updateRollConfiguration(_event, _, formData) {
         const { ...rest } = foundry.utils.expandObject(formData.object);
-        this.config.extraFormula = rest.extraFormula;
+        foundry.utils.mergeObject(this.config.roll, rest.roll)
         this.config.selectedRollMode = rest.selectedRollMode;
 
         this.render();
diff --git a/module/applications/dialogs/damageReductionDialog.mjs b/module/applications/dialogs/damageReductionDialog.mjs
index 984106d7..658cef96 100644
--- a/module/applications/dialogs/damageReductionDialog.mjs
+++ b/module/applications/dialogs/damageReductionDialog.mjs
@@ -10,12 +10,12 @@ export default class DamageReductionDialog extends HandlebarsApplicationMixin(Ap
         this.reject = reject;
         this.actor = actor;
         this.damage = damage;
-
+        
         const canApplyArmor = damageType.every(t => actor.system.armorApplicableDamageTypes[t] === true);
         const maxArmorMarks = canApplyArmor
             ? Math.min(
                   actor.system.armorScore - actor.system.armor.system.marks.value,
-                  actor.system.rules.damageReduction.maxArmorMarked.total
+                  actor.system.rules.damageReduction.maxArmorMarked.value
               )
             : 0;
 
@@ -100,7 +100,7 @@ export default class DamageReductionDialog extends HandlebarsApplicationMixin(Ap
         context.armorScore = this.actor.system.armorScore;
         context.armorMarks = currentMarks;
         context.basicMarksUsed =
-            selectedArmorMarks.length === this.actor.system.rules.damageReduction.maxArmorMarked.total;
+            selectedArmorMarks.length === this.actor.system.rules.damageReduction.maxArmorMarked.value;
 
         const stressReductionStress = this.availableStressReductions
             ? stressReductions.reduce((acc, red) => acc + red.cost, 0)
diff --git a/module/applications/ui/chatLog.mjs b/module/applications/ui/chatLog.mjs
index 4570b076..29a0f46e 100644
--- a/module/applications/ui/chatLog.mjs
+++ b/module/applications/ui/chatLog.mjs
@@ -187,7 +187,6 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
             ui.notifications.info(game.i18n.localize('DAGGERHEART.UI.Notifications.attackTargetDoesNotExist'));
             return;
         }
-
         game.canvas.pan(token);
     };
 
@@ -207,15 +206,24 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
                 if (!confirm) return;
             }
         }
-
+        
         if (targets.length === 0)
-            ui.notifications.info(game.i18n.localize('DAGGERHEART.UI.Notifications.noTargetsSelected'));
-        for (let target of targets) {
-            let damage = message.system.roll.total;
-            if (message.system.onSave && message.system.targets.find(t => t.id === target.id)?.saved?.success === true)
-                damage = Math.ceil(damage * (CONFIG.DH.ACTIONS.damageOnSave[message.system.onSave]?.mod ?? 1));
+            return ui.notifications.info(game.i18n.localize('DAGGERHEART.UI.Notifications.noTargetsSelected'));
 
-            target.actor.takeDamage(damage, message.system.damage.damageType);
+        for (let target of targets) {
+            let damages = message.system.damage;
+            if (message.system.onSave && message.system.targets.find(t => t.id === target.id)?.saved?.success === true) {
+                const mod = CONFIG.DH.ACTIONS.damageOnSave[message.system.onSave]?.mod ?? 1;
+                Object.entries(damages).forEach((k,v) => {
+                    let newTotal = 0;
+                    v.forEach(part => {
+                        v.total = Math.ceil(v.total * mod);
+                        newTotal += v.total;
+                    })
+                })
+            }
+
+            target.actor.takeDamage(damages.roll);
         }
     };
 
@@ -224,10 +232,10 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
         const targets = Array.from(game.user.targets);
 
         if (targets.length === 0)
-            ui.notifications.info(game.i18n.localize('DAGGERHEART.UI.Notifications.noTargetsSelected'));
-
+            return ui.notifications.info(game.i18n.localize('DAGGERHEART.UI.Notifications.noTargetsSelected'));
+        
         for (var target of targets) {
-            target.actor.takeHealing([{ value: message.system.roll.total, type: message.system.roll.type }]);
+            target.actor.takeHealing(message.system.roll);
         }
     };
 
diff --git a/module/config/generalConfig.mjs b/module/config/generalConfig.mjs
index 632e5448..efe8a016 100644
--- a/module/config/generalConfig.mjs
+++ b/module/config/generalConfig.mjs
@@ -89,6 +89,11 @@ export const healingTypes = {
         id: 'armorStack',
         label: 'DAGGERHEART.CONFIG.HealingType.armorStack.name',
         abbreviation: 'DAGGERHEART.CONFIG.HealingType.armorStack.abbreviation'
+    },
+    fear: {
+        id: 'fear',
+        label: 'DAGGERHEART.CONFIG.HealingType.fear.name',
+        abbreviation: 'DAGGERHEART.CONFIG.HealingType.fear.abbreviation'
     }
 };
 
diff --git a/module/data/action/actionDice.mjs b/module/data/action/actionDice.mjs
index d71b390a..c3c28247 100644
--- a/module/data/action/actionDice.mjs
+++ b/module/data/action/actionDice.mjs
@@ -93,10 +93,32 @@ export class DHDamageField extends fields.SchemaField {
     }
 }
 
-export class DHDamageData extends foundry.abstract.DataModel {
+export class DHResourceData extends foundry.abstract.DataModel {
     /** @override */
     static defineSchema() {
         return {
+            applyTo: new fields.StringField({
+                choices: CONFIG.DH.GENERAL.healingTypes,
+                required: true,
+                blank: false,
+                initial: CONFIG.DH.GENERAL.healingTypes.hitPoints.id,
+                label: 'DAGGERHEART.ACTIONS.Settings.applyTo.label'
+            }),
+            resultBased: new fields.BooleanField({
+                initial: false,
+                label: 'DAGGERHEART.ACTIONS.Settings.resultBased.label'
+            }),
+            value: new fields.EmbeddedDataField(DHActionDiceData),
+            valueAlt: new fields.EmbeddedDataField(DHActionDiceData)
+        }
+    }
+}
+
+export class DHDamageData extends DHResourceData {
+    /** @override */
+    static defineSchema() {
+        return {
+            ...super.defineSchema(),
             base: new fields.BooleanField({ initial: false, readonly: true, label: 'Base' }),
             type: new fields.SetField(
                 new fields.StringField({
@@ -106,16 +128,9 @@ export class DHDamageData extends foundry.abstract.DataModel {
                     required: true
                 }),
                 {
-                    label: 'Type',
-                    initial: 'physical'
+                    label: 'Type'
                 }
-            ),
-            resultBased: new fields.BooleanField({
-                initial: false,
-                label: 'DAGGERHEART.ACTIONS.Settings.resultBased.label'
-            }),
-            value: new fields.EmbeddedDataField(DHActionDiceData),
-            valueAlt: new fields.EmbeddedDataField(DHActionDiceData)
-        };
+            )
+        }
     }
 }
diff --git a/module/data/action/baseAction.mjs b/module/data/action/baseAction.mjs
index a46b0a85..f0176d78 100644
--- a/module/data/action/baseAction.mjs
+++ b/module/data/action/baseAction.mjs
@@ -1,4 +1,4 @@
-import { DHActionDiceData, DHActionRollData, DHDamageField } from './actionDice.mjs';
+import { DHActionDiceData, DHActionRollData, DHDamageData, DHDamageField, DHResourceData } from './actionDice.mjs';
 import DhpActor from '../../documents/actor.mjs';
 import D20RollDialog from '../../applications/dialogs/d20RollDialog.mjs';
 
@@ -96,21 +96,7 @@ export default class DHBaseAction extends foundry.abstract.DataModel {
                         onSave: new fields.BooleanField({ initial: false })
                     })
                 ),
-                healing: new fields.SchemaField({
-                    type: new fields.StringField({
-                        choices: CONFIG.DH.GENERAL.healingTypes,
-                        required: true,
-                        blank: false,
-                        initial: CONFIG.DH.GENERAL.healingTypes.hitPoints.id,
-                        label: 'Healing'
-                    }),
-                    resultBased: new fields.BooleanField({
-                        initial: false,
-                        label: 'DAGGERHEART.ACTIONS.Settings.resultBased.label'
-                    }),
-                    value: new fields.EmbeddedDataField(DHActionDiceData),
-                    valueAlt: new fields.EmbeddedDataField(DHActionDiceData)
-                }),
+                healing: new fields.EmbeddedDataField(DHResourceData),
                 beastform: new fields.SchemaField({
                     tierAccess: new fields.SchemaField({
                         exact: new fields.NumberField({ integer: true, nullable: true, initial: null })
@@ -156,7 +142,7 @@ export default class DHBaseAction extends foundry.abstract.DataModel {
     static getSourceConfig(parent) {
         const updateSource = {};
         updateSource.img ??= parent?.img ?? parent?.system?.img;
-        if (parent?.type === 'weapon') {
+        if (parent?.type === 'weapon' && this === game.system.api.models.actions.actionsTypes.attack) {
             updateSource['damage'] = { includeBase: true };
             updateSource['range'] = parent?.system?.attack?.range;
             updateSource['roll'] = {
@@ -177,6 +163,7 @@ export default class DHBaseAction extends foundry.abstract.DataModel {
     }
 
     getRollData(data = {}) {
+        if(!this.actor) return null;
         const actorData = this.actor.getRollData(false);
 
         // Add Roll results to RollDatas
@@ -191,6 +178,8 @@ export default class DHBaseAction extends foundry.abstract.DataModel {
     }
 
     async use(event, ...args) {
+        if(!this.actor) throw new Error("An Action can't be used outside of an Actor context.");
+        
         const isFastForward = event.shiftKey || (!this.hasRoll && !this.hasSave);
         // Prepare base Config
         const initConfig = this.initActionConfig(event);
@@ -227,7 +216,6 @@ export default class DHBaseAction extends foundry.abstract.DataModel {
         if (Hooks.call(`${CONFIG.DH.id}.preUseAction`, this, config) === false) return;
 
         // Display configuration window if necessary
-        // if (config.dialog?.configure && this.requireConfigurationDialog(config)) {
         if (this.requireConfigurationDialog(config)) {
             config = await D20RollDialog.configure(null, config);
             if (!config) return;
diff --git a/module/data/action/damageAction.mjs b/module/data/action/damageAction.mjs
index ccd996f7..13461d30 100644
--- a/module/data/action/damageAction.mjs
+++ b/module/data/action/damageAction.mjs
@@ -1,3 +1,4 @@
+import { setsEqual } from '../../helpers/utils.mjs';
 import DHBaseAction from './baseAction.mjs';
 
 export default class DHDamageAction extends DHBaseAction {
@@ -18,28 +19,40 @@ export default class DHDamageAction extends DHBaseAction {
         return formulaValue;
     }
 
+    formatFormulas(formulas, systemData) {
+        const formattedFormulas = [];
+        formulas.forEach(formula => {
+            if (isNaN(formula.formula)) formula.formula = Roll.replaceFormulaData(formula.formula, this.getRollData(systemData));
+            const same = formattedFormulas.find(f => setsEqual(f.damageTypes, formula.damageTypes) && f.applyTo === formula.applyTo);
+            if(same)
+                same.formula += ` + ${formula.formula}`;
+            else
+                formattedFormulas.push(formula);
+        })
+        return formattedFormulas;
+    }
+
     async rollDamage(event, data) {
         const systemData = data.system ?? data;
-        let formula = this.damage.parts.map(p => this.getFormulaValue(p, data).getFormula(this.actor)).join(' + '),
-            damageTypes = [...new Set(this.damage.parts.reduce((a, c) => a.concat([...c.type]), []))];
+       
+        let formulas = this.damage.parts.map(p => ({
+            formula: this.getFormulaValue(p, data).getFormula(this.actor),
+            damageTypes: p.applyTo === 'hitPoints' && !p.type.size ? new Set(['physical']) : p.type,
+            applyTo: p.applyTo
+        }));
 
-        damageTypes = !damageTypes.length ? ['physical'] : damageTypes;
+        if(!formulas.length) return;
 
-        if (!formula || formula == '') return;
-        let roll = { formula: formula, total: formula },
-            bonusDamage = [];
-
-        if (isNaN(formula)) formula = Roll.replaceFormulaData(formula, this.getRollData(systemData));
+        formulas = this.formatFormulas(formulas, systemData);
 
         const config = {
             title: game.i18n.format('DAGGERHEART.UI.Chat.damageRoll.title', { damage: this.name }),
-            roll: { formula },
+            roll: formulas,
             targets: systemData.targets.filter(t => t.hit) ?? data.targets,
             hasSave: this.hasSave,
             isCritical: systemData.roll?.isCritical ?? false,
             source: systemData.source,
             data: this.getRollData(),
-            damageTypes,
             event
         };
         if (this.hasSave) config.onSave = this.save.damageMod;
@@ -50,10 +63,6 @@ export default class DHDamageAction extends DHBaseAction {
             config.directDamage = true;
         }
 
-        roll = CONFIG.Dice.daggerheart.DamageRoll.build(config);
+        return CONFIG.Dice.daggerheart.DamageRoll.build(config);
     }
-
-    // get modifiers() {
-    //     return [];
-    // }
 }
diff --git a/module/data/action/healingAction.mjs b/module/data/action/healingAction.mjs
index 4c1366a1..e0a74f27 100644
--- a/module/data/action/healingAction.mjs
+++ b/module/data/action/healingAction.mjs
@@ -15,25 +15,25 @@ export default class DHHealingAction extends DHBaseAction {
     }
 
     async rollHealing(event, data) {
-        let formulaValue = this.getFormulaValue(data),
-            formula = formulaValue.getFormula(this.actor);
-
-        if (!formula || formula == '') return;
-        let roll = { formula: formula, total: formula },
-            bonusDamage = [];
-
+        const systemData = data.system ?? data;
+        let formulas = [{
+            formula: this.getFormulaValue(data).getFormula(this.actor),
+            applyTo: this.healing.applyTo
+        }];
+        
         const config = {
             title: game.i18n.format('DAGGERHEART.UI.Chat.healingRoll.title', {
-                healing: game.i18n.localize(CONFIG.DH.GENERAL.healingTypes[this.healing.type].label)
+                healing: game.i18n.localize(CONFIG.DH.GENERAL.healingTypes[this.healing.applyTo].label)
             }),
-            roll: { formula },
+            roll: formulas,
             targets: (data.system?.targets ?? data.targets).filter(t => t.hit),
             messageType: 'healing',
-            type: this.healing.type,
+            source: systemData.source,
+            data: this.getRollData(),
             event
         };
 
-        roll = CONFIG.Dice.daggerheart.DamageRoll.build(config);
+        return CONFIG.Dice.daggerheart.DamageRoll.build(config);
     }
 
     get chatTemplate() {
diff --git a/module/data/actor/character.mjs b/module/data/actor/character.mjs
index c15d2221..292eedb7 100644
--- a/module/data/actor/character.mjs
+++ b/module/data/actor/character.mjs
@@ -170,11 +170,10 @@ export default class DhCharacter extends BaseDataActor {
             rules: new fields.SchemaField({
                 damageReduction: new fields.SchemaField({
                     maxArmorMarked: new fields.SchemaField({
-                        value: new fields.NumberField({ required: true, integer: true, initial: 1 }),
-                        bonus: new fields.NumberField({
+                        value: new fields.NumberField({
                             required: true,
                             integer: true,
-                            initial: 0,
+                            initial: 1,
                             label: 'DAGGERHEART.GENERAL.Rules.damageReduction.maxArmorMarkedBonus'
                         }),
                         stressExtra: new fields.NumberField({
diff --git a/module/dice/d20Roll.mjs b/module/dice/d20Roll.mjs
index 58d45f95..09dd716e 100644
--- a/module/dice/d20Roll.mjs
+++ b/module/dice/d20Roll.mjs
@@ -140,28 +140,22 @@ export default class D20Roll extends DHRoll {
         return modifiers;
     }
 
-    static async buildEvaluate(roll, config = {}, message = {}) {
-        if (config.evaluate !== false) await roll.evaluate();
-
-        this.postEvaluate(roll, config);
-    }
-
     static postEvaluate(roll, config = {}) {
-        super.postEvaluate(roll, config);
+        const data = super.postEvaluate(roll, config);
         if (config.targets?.length) {
             config.targets.forEach(target => {
                 const difficulty = config.roll.difficulty ?? target.difficulty ?? target.evasion;
                 target.hit = this.isCritical || roll.total >= difficulty;
             });
         } else if (config.roll.difficulty)
-            config.roll.success = roll.isCritical || roll.total >= config.roll.difficulty;
-        config.roll.advantage = {
+            data.success = roll.isCritical || roll.total >= config.roll.difficulty;
+        data.advantage = {
             type: config.roll.advantage,
             dice: roll.dAdvantage?.denomination,
             value: roll.dAdvantage?.total
         };
-        config.roll.isCritical = roll.isCritical;
-        config.roll.extra = roll.dice
+        data.isCritical = roll.isCritical;
+        data.extra = roll.dice
             .filter(d => !roll.baseTerms.includes(d))
             .map(d => {
                 return {
@@ -169,7 +163,8 @@ export default class D20Roll extends DHRoll {
                     value: d.total
                 };
             });
-        config.roll.modifierTotal = this.calculateTotalModifiers(roll);
+        data.modifierTotal = this.calculateTotalModifiers(roll);
+        return data;
     }
 
     resetFormula() {
diff --git a/module/dice/damageRoll.mjs b/module/dice/damageRoll.mjs
index bfbfc7d5..aa1c4c86 100644
--- a/module/dice/damageRoll.mjs
+++ b/module/dice/damageRoll.mjs
@@ -10,10 +10,24 @@ export default class DamageRoll extends DHRoll {
 
     static DefaultDialog = DamageDialog;
 
-    static async postEvaluate(roll, config = {}) {
-        super.postEvaluate(roll, config);
-        config.roll.type = config.type;
-        config.roll.modifierTotal = this.calculateTotalModifiers(roll);
+    static async buildEvaluate(roll, config = {}, message = {}) {
+        if ( config.evaluate !== false ) {
+            for ( const roll of config.roll ) await roll.roll.evaluate();
+        }
+        roll._evaluated = true;
+        const parts = config.roll.map(r => this.postEvaluate(r));
+        config.roll = this.unifyDamageRoll(parts);
+    }
+
+    static postEvaluate(roll, config = {}) {
+        return {
+            ...roll,
+            ...super.postEvaluate(roll.roll, config),
+            damageTypes: [...(roll.damageTypes ?? [])],
+            roll: roll.roll,
+            type: config.type,
+            modifierTotal: this.calculateTotalModifiers(roll.roll)
+        }
     }
 
     static async buildPost(roll, config, message) {
@@ -24,12 +38,50 @@ export default class DamageRoll extends DHRoll {
         }
     }
 
-    applyBaseBonus() {
+    static unifyDamageRoll(rolls) {
+        const unified = {};
+        rolls.forEach(r => {
+            const resource = unified[r.applyTo] ?? { formula: '', total: 0, parts: [] };
+            resource.formula += `${resource.formula !== '' ? ' + ' : ''}${r.formula}`;
+            resource.total += r.total;
+            resource.parts.push(r);
+            unified[r.applyTo] = resource;
+        })
+        return unified;
+    }
+
+    static formatGlobal(rolls) {
+        let formula, total;
+        const applyTo = new Set(rolls.flatMap(r => r.applyTo));
+        if(applyTo.size > 1) {
+            const data = {};
+            rolls.forEach(r => {
+                if(data[r.applyTo]) {
+                    data[r.applyTo].formula += ` + ${r.formula}` ;
+                    data[r.applyTo].total += r.total ;
+                } else {
+                    data[r.applyTo] = {
+                        formula: r.formula,
+                        total: r.total
+                    }
+                }
+            });
+            formula = Object.entries(data).reduce((a, [k,v]) => a + ` ${k}: ${v.formula}`, '');
+            total = Object.entries(data).reduce((a, [k,v]) => a + ` ${k}: ${v.total}`, '');
+        } else {
+            formula = rolls.map(r => r.formula).join(' + ');
+            total = rolls.reduce((a,c) => a + c.total, 0)
+        }
+        return {formula, total}
+    }
+
+    applyBaseBonus(part) {
         const modifiers = [],
-            type = this.options.messageType ?? 'damage';
+            type = this.options.messageType ?? 'damage',
+            options = part ?? this.options;
 
         modifiers.push(...this.getBonus(`${type}`, `${type.capitalize()} Bonus`));
-        this.options.damageTypes?.forEach(t => {
+        options.damageTypes?.forEach(t => {
             modifiers.push(...this.getBonus(`${type}.${t}`, `${t.capitalize()} ${type.capitalize()} Bonus`));
         });
         const weapons = ['primaryWeapon', 'secondaryWeapon'];
@@ -42,13 +94,36 @@ export default class DamageRoll extends DHRoll {
     }
 
     constructFormula(config) {
-        super.constructFormula(config);
+        this.options.roll.forEach( part => {
+            part.roll = new Roll(part.formula);
+            this.constructFormulaPart(config, part)
+        })
+        return this.options.roll;
+    }
 
-        if (config.isCritical) {
-            const tmpRoll = new Roll(this._formula)._evaluateSync({ maximize: true }),
-                criticalBonus = tmpRoll.total - this.constructor.calculateTotalModifiers(tmpRoll);
-            this.terms.push(...this.formatModifier(criticalBonus));
+    constructFormulaPart(config, part) {
+        part.roll.terms = Roll.parse(part.roll.formula, config.data);
+
+        if(part.applyTo === CONFIG.DH.GENERAL.healingTypes.hitPoints.id) {
+            part.modifiers = this.applyBaseBonus(part);
+            this.addModifiers(part);
+            part.modifiers?.forEach(m => {
+                part.roll.terms.push(...this.formatModifier(m.value));
+            });
         }
-        return (this._formula = this.constructor.getFormula(this.terms));
+
+        if (part.extraFormula) {
+            part.roll.terms.push(
+                new foundry.dice.terms.OperatorTerm({ operator: '+' }),
+                ...this.constructor.parse(part.extraFormula, this.options.data)
+            );
+        }
+        
+        if (config.isCritical && part.applyTo === CONFIG.DH.GENERAL.healingTypes.hitPoints.id) {
+            const tmpRoll = Roll.fromTerms(part.roll.terms)._evaluateSync({ maximize: true }),
+                criticalBonus = tmpRoll.total - this.constructor.calculateTotalModifiers(tmpRoll);
+            part.roll.terms.push(...this.formatModifier(criticalBonus));
+        }
+        return (part.roll._formula = this.constructor.getFormula(part.roll.terms));
     }
 }
diff --git a/module/dice/dhRoll.mjs b/module/dice/dhRoll.mjs
index 33de251b..cb1007e3 100644
--- a/module/dice/dhRoll.mjs
+++ b/module/dice/dhRoll.mjs
@@ -47,7 +47,7 @@ export default class DHRoll extends Roll {
 
     static async buildEvaluate(roll, config = {}, message = {}) {
         if (config.evaluate !== false) await roll.evaluate();
-        this.postEvaluate(roll, config);
+        config.roll = this.postEvaluate(roll, config);
     }
 
     static async buildPost(roll, config, message) {
@@ -57,25 +57,26 @@ export default class DHRoll extends Roll {
 
         // Create Chat Message
         if (config.source?.message) {
+            if(Object.values(config.roll)?.length) {
+                const pool = foundry.dice.terms.PoolTerm.fromRolls(Object.values(config.roll).flatMap(r => r.parts.map(p => p.roll)));
+                roll = Roll.fromTerms([pool]);
+            }
             if (game.modules.get('dice-so-nice')?.active) await game.dice3d.showForRoll(roll, game.user, true);
-        } else {
+        } else 
             config.message = await this.toMessage(roll, config);
-        }
     }
 
     static postEvaluate(roll, config = {}) {
-        if (!config.roll) config.roll = {};
-        config.roll.total = roll.total;
-        config.roll.formula = roll.formula;
-        config.roll.dice = [];
-        roll.dice.forEach(d => {
-            config.roll.dice.push({
+        return {
+            total: roll.total,
+            formula: roll.formula,
+            dice: roll.dice.map(d => ({
                 dice: d.denomination,
                 total: d.total,
                 formula: d.formula,
                 results: d.results
-            });
-        });
+            }))
+        }
     }
 
     static async toMessage(roll, config) {
@@ -118,8 +119,9 @@ export default class DHRoll extends Roll {
         return [];
     }
 
-    addModifiers() {
-        this.options.roll.modifiers?.forEach(m => {
+    addModifiers(roll) {
+        roll = roll ?? this.options.roll;
+        roll.modifiers?.forEach(m => {
             this.terms.push(...this.formatModifier(m.value));
         });
     }
diff --git a/module/dice/dualityRoll.mjs b/module/dice/dualityRoll.mjs
index 5fd71e6c..e36d2427 100644
--- a/module/dice/dualityRoll.mjs
+++ b/module/dice/dualityRoll.mjs
@@ -161,21 +161,21 @@ export default class DualityRoll extends D20Roll {
     }
 
     static postEvaluate(roll, config = {}) {
-        super.postEvaluate(roll, config);
+        const data = super.postEvaluate(roll, config);
         
-        config.roll.hope = {
+        data.hope = {
             dice: roll.dHope.denomination,
             value: roll.dHope.total
         };
-        config.roll.fear = {
+        data.fear = {
             dice: roll.dFear.denomination,
             value: roll.dFear.total
         };
-        config.roll.rally = {
+        data.rally = {
             dice: roll.dRally?.denomination,
             value: roll.dRally?.total
         };
-        config.roll.result = {
+        data.result = {
             duality: roll.withHope ? 1 : roll.withFear ? -1 : 0,
             total: roll.dHope.total + roll.dFear.total,
             label: roll.totalLabel
@@ -184,6 +184,8 @@ export default class DualityRoll extends D20Roll {
         if(roll._rallyIndex && roll.data?.parent) 
             roll.data.parent.deleteEmbeddedDocuments('ActiveEffect', [roll._rallyIndex]);
 
-        setDiceSoNiceForDualityRoll(roll, config.roll.advantage.type);
+        setDiceSoNiceForDualityRoll(roll, data.advantage.type);
+
+        return data;
     }
 }
diff --git a/module/documents/actor.mjs b/module/documents/actor.mjs
index 73a8a3db..e6ae781a 100644
--- a/module/documents/actor.mjs
+++ b/module/documents/actor.mjs
@@ -391,59 +391,70 @@ export default class DhpActor extends Actor {
         return canUseArmor || canUseStress;
     }
 
-    async takeDamage(baseDamage, type) {
-        if (Hooks.call(`${CONFIG.DH.id}.preTakeDamage`, this, baseDamage, type) === false) return null;
+    async takeDamage(damages) {
+        if (Hooks.call(`${CONFIG.DH.id}.preTakeDamage`, this, damages) === false) return null;
 
         if (this.type === 'companion') {
             await this.modifyResource([{ value: 1, key: 'stress' }]);
             return;
         }
 
-        type = !Array.isArray(type) ? [type] : type;
+        const updates = [];
 
-        const hpDamage = this.calculateDamage(baseDamage, type);
+        Object.entries(damages).forEach(([key, damage]) => {
+            damage.parts.forEach(part => {
+                if(part.applyTo === CONFIG.DH.GENERAL.healingTypes.hitPoints.id)
+                    part.total = this.calculateDamage(part.total, part.damageTypes);
+                const update = updates.find(u => u.key === key);
+                if(update) {
+                    update.value += part.total;
+                    update.damageTypes.add(...new Set(part.damageTypes));
+                } else updates.push({ value: part.total, key, damageTypes: new Set(part.damageTypes) })
+            })
+        });
 
-        if (!hpDamage) return;
+        if (Hooks.call(`${CONFIG.DH.id}.postCalculateDamage`, this, damages) === false) return null;
 
-        const updates = [{ value: hpDamage, type: 'hitPoints' }];
+        if(!updates.length) return;
 
-        if (this.type === 'character' && this.system.armor && this.#canReduceDamage(hpDamage, type)) {
-            const armorStackResult = await this.owner.query('armorStack', {
-                actorId: this.uuid,
-                damage: hpDamage,
-                type: type
-            });
-            if (armorStackResult) {
-                const { modifiedDamage, armorSpent, stressSpent } = armorStackResult;
-                updates.find(u => u.type === 'hitPoints').value = modifiedDamage;
-                updates.push(
-                    ...(armorSpent ? [{ value: armorSpent, key: 'armorStack' }] : []),
-                    ...(stressSpent ? [{ value: stressSpent, key: 'stress' }] : [])
-                );
+        const hpDamage = updates.find(u => u.key === CONFIG.DH.GENERAL.healingTypes.hitPoints.id);
+        if(hpDamage) {
+            hpDamage.value = this.convertDamageToThreshold(hpDamage.value);
+            if (this.type === 'character' && this.system.armor && this.#canReduceDamage(hpDamage.value, hpDamage.damageTypes)) {
+                const armorStackResult = await this.owner.query('armorStack', {
+                    actorId: this.uuid,
+                    damage: hpDamage.value,
+                    type: [...hpDamage.damageTypes]
+                });
+                if (armorStackResult) {
+                    const { modifiedDamage, armorSpent, stressSpent } = armorStackResult;
+                    updates.find(u => u.key === 'hitPoints').value = modifiedDamage;
+                    updates.push(
+                        ...(armorSpent ? [{ value: armorSpent, key: 'armorStack' }] : []),
+                        ...(stressSpent ? [{ value: stressSpent, key: 'stress' }] : [])
+                    );
+                }
             }
         }
-
+        
+        updates.forEach( u =>
+            u.value = u.key === 'fear' || this.system?.resources?.[u.key]?.isReversed === false ? u.value * -1 : u.value
+        );
+        
         await this.modifyResource(updates);
 
-        if (Hooks.call(`${CONFIG.DH.id}.postTakeDamage`, this, damage, type) === false) return null;
+        if (Hooks.call(`${CONFIG.DH.id}.postTakeDamage`, this, damages) === false) return null;
     }
 
     calculateDamage(baseDamage, type) {
-        if (Hooks.call(`${CONFIG.DH.id}.preCalculateDamage`, this, baseDamage, type) === false) return null;
 
-        /* if(this.system.resistance[type]?.immunity) return 0;
-        if(this.system.resistance[type]?.resistance) baseDamage = Math.ceil(baseDamage / 2); */
         if (this.canResist(type, 'immunity')) return 0;
         if (this.canResist(type, 'resistance')) baseDamage = Math.ceil(baseDamage / 2);
 
-        // const flatReduction = this.system.resistance[type].reduction;
         const flatReduction = this.getDamageTypeReduction(type);
         const damage = Math.max(baseDamage - (flatReduction ?? 0), 0);
-        const hpDamage = this.convertDamageToThreshold(damage);
 
-        if (Hooks.call(`${CONFIG.DH.id}.postCalculateDamage`, this, baseDamage, type) === false) return null;
-
-        return hpDamage;
+        return damage;
     }
 
     canResist(type, resistance) {
@@ -461,8 +472,13 @@ export default class DhpActor extends Actor {
     }
 
     async takeHealing(resources) {
-        resources.forEach(r => (r.value *= -1));
-        await this.modifyResource(resources);
+        const updates = Object.entries(resources).map(([key, value]) => (
+            {
+                key: key,
+                value: !(key === 'fear' || this.system?.resources?.[key]?.isReversed === false) ? value.total * -1 : value.total
+            }
+        ))
+        await this.modifyResource(updates);
     }
 
     async modifyResource(resources) {
diff --git a/module/documents/token.mjs b/module/documents/token.mjs
index 89305128..f48af563 100644
--- a/module/documents/token.mjs
+++ b/module/documents/token.mjs
@@ -16,7 +16,7 @@ export default class DHToken extends TokenDocument {
         });
         bars.sort((a, b) => a.label.compare(b.label));
 
-        const invalidAttributes = ['gold', 'levelData', 'actions', 'rules.damageReduction.maxArmorMarked.value'];
+        const invalidAttributes = ['gold', 'levelData', 'actions'];
         const values = attributes.value.reduce((acc, v) => {
             const a = v.join('.');
             if (invalidAttributes.some(x => a.startsWith(x))) return acc;
diff --git a/module/helpers/utils.mjs b/module/helpers/utils.mjs
index 336ecf5b..91671e36 100644
--- a/module/helpers/utils.mjs
+++ b/module/helpers/utils.mjs
@@ -311,3 +311,15 @@ export const itemAbleRollParse = (value, actor, item) => {
         return '';
     }
 };
+
+export const arraysEqual = (a, b) =>
+  a.length === b.length &&
+  [...new Set([...a, ...b])].every(
+    v => a.filter(e => e === v).length === b.filter(e => e === v).length
+  );
+
+export const setsEqual = (a, b) =>
+    a.size === b.size &&
+    [...a].every(
+        value => b.has(value)
+    );
\ No newline at end of file
diff --git a/styles/less/global/dialog.less b/styles/less/global/dialog.less
index 11a4eee9..8c86e825 100644
--- a/styles/less/global/dialog.less
+++ b/styles/less/global/dialog.less
@@ -56,4 +56,15 @@
 
         color: light-dark(@dark, @beige);
     }
+
+    .damage-formula {
+        display: flex;
+        justify-content: space-between;
+        .damage-details {
+            font-style: italic;
+            display: flex;
+            align-items: center;
+            gap: 5px;
+        }
+    }
 }
diff --git a/styles/less/global/elements.less b/styles/less/global/elements.less
index 9d38e386..b9509b38 100755
--- a/styles/less/global/elements.less
+++ b/styles/less/global/elements.less
@@ -109,7 +109,7 @@
         height: 34px;
         .tags {
             justify-content: flex-start;
-            margin: 5px;
+            margin: 4px;
             height: inherit;
             .tag {
                 padding: 0.3rem 0.5rem;
diff --git a/styles/less/ui/chat/chat.less b/styles/less/ui/chat/chat.less
index 12e8ba0c..6b5db1b9 100644
--- a/styles/less/ui/chat/chat.less
+++ b/styles/less/ui/chat/chat.less
@@ -164,6 +164,11 @@
                     }
                 }
             }
+
+            .damage-resource {
+                font-weight: 600;
+                margin-top: 5px;
+            }
         }
 
         .dice-total {
diff --git a/templates/actionTypes/damage.hbs b/templates/actionTypes/damage.hbs
index 3c125bd7..bfbbc592 100644
--- a/templates/actionTypes/damage.hbs
+++ b/templates/actionTypes/damage.hbs
@@ -22,7 +22,12 @@
                     {{formField ../fields.value.fields.bonus value=dmg.value.bonus name=(concat ../path "damage.parts." index ".value.bonus") localize=true classes="inline-child"}}
                 </div>
             {{/if}}
-            {{formField ../fields.type value=dmg.type name=(concat ../path "damage.parts." index ".type") localize=true}}
+            <div class="nest-inputs">
+                {{formField ../fields.applyTo value=dmg.applyTo name=(concat ../path "damage.parts." realIndex ".applyTo") localize=true}}
+                {{#if (eq dmg.applyTo 'hitPoints')}}
+                    {{formField ../fields.type value=dmg.type name=(concat ../path "damage.parts." index ".type") localize=true}}
+                {{/if}}
+            </div>
             {{#if ../horde}}
                 <fieldset class="one-column">
                     <legend>{{localize "DAGGERHEART.ACTORS.Adversary.hordeDamage"}}</legend>
@@ -56,7 +61,12 @@
                                 {{> formula fields=../../fields.value.fields type=../fields.type dmg=dmg source=dmg.value target="value" realIndex=realIndex}}
                             </fieldset>
                         {{/if}}
-                        {{formField ../../fields.type value=dmg.type name=(concat "damage.parts." realIndex ".type") localize=true}} 
+                        <div class="nest-inputs">
+                            {{formField ../../fields.applyTo value=dmg.applyTo name=(concat "damage.parts." realIndex ".applyTo") localize=true}}
+                            {{#if (eq dmg.applyTo 'hitPoints')}}
+                                {{formField ../../fields.type value=dmg.type name=(concat "damage.parts." realIndex ".type") localize=true}}
+                            {{/if}}
+                        </div>
                         <input type="hidden" name="damage.parts.{{realIndex}}.base" value="{{dmg.base}}">
                     </fieldset>
                     {{#unless dmg.base}}<div class="fas fa-trash" data-action="removeDamage" data-index="{{realIndex}}"></div>{{/unless}}
diff --git a/templates/actionTypes/healing.hbs b/templates/actionTypes/healing.hbs
index 5bf46f7a..4b095174 100644
--- a/templates/actionTypes/healing.hbs
+++ b/templates/actionTypes/healing.hbs
@@ -1,43 +1,41 @@
 
-<fieldset class="action-category">
-    <legend class="action-category-label" data-action="toggleSection" data-section="effects">
-        <div>Healing</div>
+<fieldset class="one-column">
+    <legend>
+        {{localize "DAGGERHEART.GENERAL.healing"}}
     </legend>
-    <div class="action-category-data open">
-        <fieldset>
-            {{formField fields.type value=source.type name="healing.type" localize=true}}
-            {{#if (and (not @root.isNPC) @root.hasRoll)}}
-                {{formField fields.resultBased value=source.resultBased name="healing.resultBased" localize=true}}
-            {{/if}}
-            {{#if (and (not @root.isNPC) @root.hasRoll source.resultBased)}}
-                <fieldset>
-                    <legend>
-                        <div>With Hope</div>
-                    </legend>
-                    {{> formula fields=fields.value.fields source=source.value target="value"}}
-                </fieldset>
-                <fieldset>
-                    <legend>
-                        <div>With Fear</div>
-                    </legend>
-                    {{> formula fields=fields.valueAlt.fields source=source.valueAlt target="valueAlt"}}
-                </fieldset>
-            {{else}}
+    {{#if (and (not @root.isNPC) @root.hasRoll)}}
+        {{formField fields.resultBased value=source.resultBased name="healing.resultBased" localize=true classes="checkbox"}}
+    {{/if}}
+    {{#if (and (not @root.isNPC) @root.hasRoll source.resultBased)}}
+        <div class="nest-inputs">
+            <fieldset class="one-column">
+                <legend>
+                    <div>With Hope</div>
+                </legend>
                 {{> formula fields=fields.value.fields source=source.value target="value"}}
-            {{/if}}
-        </fieldset>
-    </div>
+            </fieldset>
+            <fieldset class="one-column">
+                <legend>
+                    <div>With Fear</div>
+                </legend>
+                {{> formula fields=fields.valueAlt.fields source=source.valueAlt target="valueAlt"}}
+            </fieldset>
+        </div>
+    {{else}}
+        {{> formula fields=fields.value.fields source=source.value target="value"}}
+    {{/if}}
+    {{formField fields.applyTo value=source.type name="healing.applyTo" localize=true}}
 </fieldset>
 
 {{#*inline "formula"}}
-    <div class="multi-display">
-        {{formField fields.custom.fields.enabled value=source.custom.enabled name=(concat "healing." target ".custom.enabled")}}
-        {{#if source.custom.enabled}}
-            {{formField fields.custom.fields.formula value=source.custom.formula name=(concat "healing." target ".custom.formula") localize=true}}
-        {{else}}
+    {{formField fields.custom.fields.enabled value=source.custom.enabled name=(concat "healing." target ".custom.enabled") classes="checkbox"}}
+    {{#if source.custom.enabled}}
+        {{formField fields.custom.fields.formula value=source.custom.formula name=(concat "healing." target ".custom.formula") localize=true}}
+    {{else}}
+        <div class="nest-inputs">
             {{formField fields.multiplier value=source.multiplier name=(concat "healing." target ".multiplier") localize=true}}
             {{formField fields.dice value=source.dice name=(concat "healing." target ".dice")}}
             {{formField fields.bonus value=source.bonus name=(concat "healing." target ".bonus") localize=true}}
-        {{/if}}
-    </div>
+        </div>
+    {{/if}}
 {{/inline}}
\ No newline at end of file
diff --git a/templates/dialogs/dice-roll/damageSelection.hbs b/templates/dialogs/dice-roll/damageSelection.hbs
index bd97cfdf..3e47cf68 100644
--- a/templates/dialogs/dice-roll/damageSelection.hbs
+++ b/templates/dialogs/dice-roll/damageSelection.hbs
@@ -2,10 +2,26 @@
     <header class="dialog-header">
         <h1>{{title}}</h1>
     </header>
-    <span class="formula-label"><b>Formula:</b> {{@root.formula}}</span>
-    <div class="form-group">
-        <input type="text" value="{{extraFormula}}" name="extraFormula" placeholder="Situational Bonus">
-    </div>
+    {{#each @root.formula}}
+        <div class="damage-formula">
+            <span class="damage-resource"><b>Formula:</b> {{roll.formula}}</span>
+            <span class="damage-details">
+                {{#with (lookup @root.config.GENERAL.healingTypes applyTo)}}
+                    {{localize label}}
+                {{/with}}
+                {{#if damageTypes}}
+                    {{#each damageTypes as | type | }}
+                        {{#with (lookup @root.config.GENERAL.damageTypes type)}}
+                            <i class="fa-solid {{icon}}"></i>
+                        {{/with}}
+                    {{/each}}
+                {{/if}}
+            </span>
+        </div>
+        <div class="form-group">
+            <input type="text" value="{{extraFormula}}" name="roll.{{ @index }}.extraFormula" placeholder="Situational Bonus">
+        </div>
+    {{/each}}
     <div class="damage-section-controls">
         {{#if directDamage}}
             <select class="roll-mode-select" name="selectedRollMode">
diff --git a/templates/ui/chat/healing-roll.hbs b/templates/ui/chat/healing-roll.hbs
index 562f2a92..ca407406 100644
--- a/templates/ui/chat/healing-roll.hbs
+++ b/templates/ui/chat/healing-roll.hbs
@@ -1,27 +1,31 @@
 <div class="dice-roll daggerheart chat roll" data-action="expandRoll">
     <div class="dice-flavor">{{title}}</div>
     <div class="dice-result">
-        <div class="dice-formula">{{roll.formula}}</div>
-        <div class="dice-tooltip">
-            <div class="wrapper">
-                <section class="tooltip-part">
-                    {{#each roll.dice}}
-                        <div class="dice">
-                            <header class="part-header flexrow">
-                                <span class="part-formula">{{formula}}</span>
-                                <span class="part-total">{{total}}</span>
-                            </header>
-                            <ol class="dice-rolls">
-                                {{#each results}}
-                                    <li class="roll die {{../denomination}} min">{{result}}</li>
-                                {{/each}}
-                            </ol>
-                        </div>
+        {{#each roll as | resource index | }}
+            <div class="dice-formula">{{resource.formula}}</div>
+            <div class="dice-tooltip">
+                <div class="wrapper">
+                    {{#each resource.parts}}
+                        <section class="tooltip-part">
+                            <div class="dice">
+                                <header class="part-header flexrow">
+                                    <span class="part-formula">{{formula}}</span>
+                                    <span class="part-total">{{total}}</span>
+                                </header>
+                                <ol class="dice-rolls">
+                                    {{#each dice}}
+                                        {{#each results}}
+                                            <li class="roll die {{../dice}} min">{{result}}</li>
+                                        {{/each}}
+                                    {{/each}}
+                                </ol>
+                            </div>
+                        </section>
                     {{/each}}
-                </section>
+                </div>
             </div>
-        </div>
-        <div class="dice-total">{{roll.total}}</div>
+            <div class="dice-total">{{resource.total}}</div>
+        {{/each}}
         <div class="flexrow">
             <button class="healing-button"><span>{{localize "DAGGERHEART.UI.Chat.healingRoll.heal"}}</span></button>  
         </div>
diff --git a/templates/ui/chat/parts/damage-chat.hbs b/templates/ui/chat/parts/damage-chat.hbs
index f8d7cfed..522cdc54 100644
--- a/templates/ui/chat/parts/damage-chat.hbs
+++ b/templates/ui/chat/parts/damage-chat.hbs
@@ -1,28 +1,33 @@
 <div class="dice-roll daggerheart chat roll" data-action="expandRoll">
     {{#unless noTitle}}<div class="dice-flavor">{{damage.title}}</div>{{/unless}}
     <div class="dice-result">
-        <div class="dice-formula">{{damage.roll.formula}}</div>
-        <div class="dice-tooltip">
-            <div class="wrapper">
-                <section class="tooltip-part">
-                    {{#each damage.roll.dice}}
-                        <div class="dice">
-                            <header class="part-header flexrow">
-                                <span class="part-formula">{{formula}}</span>                                
-                                <span class="part-total">{{total}}</span>
-                            </header>
-                            <ol class="dice-rolls">
-                                {{#each results}}
-                                    <li class="roll die {{../dice}} min">{{result}}</li>
-                                {{/each}}
-                            </ol>
-                        </div>
-                    {{/each}} 
-                    {{#if damage.roll.modifierTotal}}<div class="duality-modifier">{{#if (gt damage.roll.modifierTotal 0)}}+{{/if}}{{damage.roll.modifierTotal}}</div>{{/if}}
-                    <div class="duality-result">Total: {{damage.roll.total}}</div>
-                </section>
+        {{#each damage.roll as | roll index | }}
+            <div class="dice-flavor">{{localize (concat 'DAGGERHEART.CONFIG.HealingType.' index '.name')}}</div>
+            <div class="dice-formula">{{roll.formula}}</div>
+            <div class="dice-tooltip">
+                <div class="wrapper">
+                    {{#each roll.parts}}
+                        <section class="tooltip-part">
+                                <div class="dice">
+                                    <header class="part-header flexrow">
+                                        <span class="part-formula">{{formula}}</span>
+                                        <span class="part-total">{{total}}</span>
+                                    </header>
+                                    <ol class="dice-rolls">
+                                        {{#each dice}}
+                                            {{#each results}}
+                                                <li class="roll die {{../dice}} min">{{result}}</li>
+                                            {{/each}}
+                                        {{/each}}
+                                    </ol>
+                                </div>
+                                {{#if modifierTotal}}<div class="duality-modifier">{{#if (gt modifierTotal 0)}}+{{/if}}{{modifierTotal}}</div>{{/if}}
+                                <div class="duality-result">Total: {{total}}</div>
+                        </section>
+                    {{/each}}
+                </div>
             </div>
-        </div>
-        <div class="dice-total">{{damage.roll.total}}</div>
+            <div class="dice-total">{{roll.total}}</div>
+        {{/each}}
     </div>
 </div>
\ No newline at end of file

From fc8eb8cb0405415cefc80756663b694a02a1a0e5 Mon Sep 17 00:00:00 2001
From: Dapoulp <74197441+Dapoulp@users.noreply.github.com>
Date: Sat, 19 Jul 2025 18:08:32 +0200
Subject: [PATCH 2/4] Fix Damage chat message (#377)

* Fix Damage chat message

* Fix damage save

* Fix damage save 2

* Fix damage save 2

* Fix damage save 3
---
 module/applications/ui/chatLog.mjs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/module/applications/ui/chatLog.mjs b/module/applications/ui/chatLog.mjs
index 29a0f46e..13bfb5f9 100644
--- a/module/applications/ui/chatLog.mjs
+++ b/module/applications/ui/chatLog.mjs
@@ -211,19 +211,19 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
             return ui.notifications.info(game.i18n.localize('DAGGERHEART.UI.Notifications.noTargetsSelected'));
 
         for (let target of targets) {
-            let damages = message.system.damage;
+            let damages = foundry.utils.deepClone(message.system.damage?.roll ?? message.system.roll);
             if (message.system.onSave && message.system.targets.find(t => t.id === target.id)?.saved?.success === true) {
                 const mod = CONFIG.DH.ACTIONS.damageOnSave[message.system.onSave]?.mod ?? 1;
-                Object.entries(damages).forEach((k,v) => {
-                    let newTotal = 0;
-                    v.forEach(part => {
-                        v.total = Math.ceil(v.total * mod);
-                        newTotal += v.total;
+                Object.entries(damages).forEach(([k,v]) => {
+                    v.total = 0;
+                    v.parts.forEach(part => {
+                        part.total = Math.ceil(part.total * mod);
+                        v.total += part.total;
                     })
                 })
             }
 
-            target.actor.takeDamage(damages.roll);
+            target.actor.takeDamage(damages);
         }
     };
 

From 615df6541531e63dda198db6448e31ec14ec52cf Mon Sep 17 00:00:00 2001
From: George Brocklehurst <george@georgebrock.com>
Date: Sat, 19 Jul 2025 18:04:28 +0100
Subject: [PATCH 3/4] Fix ctrl+clicking on a downtime action on macOS (#378)

* Refactor: handle button data attrs the same.

A small refactor to handle `button.dataset.move` (which was assigned to a
local const) and `button.dataset.category` (which was accessed directly)
in the same way by assigning them both to local consts.

* Fix right-click on downtime activities on macOS.

On macOS with a single-button mouse (e.g. a laptop trackpad) it's common to
trigger a right-click with ctrl+click.

In Chrome, this triggers both a `contextmenu` event and a regular `click`
event. In the context of downtime actions, this meant that we were
deselecting an action in the `contextmenu` handler but then immediately
re-selecting it again in the `click` handler.

This commit works around the problem by stopping the event from propagating
further. This fixes the bug, but also stops Foundry's default `contextmenu`
handler from firing and preventing the browser context menu from appearing,
so we also have prevent the event's default behaviour from firing.
---
 module/applications/dialogs/downtime.mjs | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/module/applications/dialogs/downtime.mjs b/module/applications/dialogs/downtime.mjs
index 15add3ad..4922b4ed 100644
--- a/module/applications/dialogs/downtime.mjs
+++ b/module/applications/dialogs/downtime.mjs
@@ -113,13 +113,24 @@ export default class DhpDowntime extends HandlebarsApplicationMixin(ApplicationV
 
     deselectMove(event) {
         const button = event.target.closest('.activity-container');
-        const move = button.dataset.move;
-        this.moveData[button.dataset.category].moves[move].selected = this.moveData[button.dataset.category].moves[move]
-            .selected
-            ? this.moveData[button.dataset.category].moves[move].selected - 1
+        const { move, category } = button.dataset;
+        this.moveData[category].moves[move].selected = this.moveData[category].moves[move].selected
+            ? this.moveData[category].moves[move].selected - 1
             : 0;
 
         this.render();
+
+        // On macOS with a single-button mouse (e.g. a laptop trackpad),
+        // right-click is triggered with ctrl+click, which triggers both a
+        // `contextmenu` event and a regular click event. We need to stop
+        // event propagation to prevent the click event from triggering the
+        // `selectMove` function and undoing the change we just made.
+        event.stopPropagation();
+
+        // Having stopped propagation, we're no longer subject to Foundry's
+        // default `contextmenu` handler, so we also have to prevent the
+        // default behaviour to prevent a context menu from appearing.
+        event.preventDefault();
     }
 
     static async takeDowntime() {

From b8930b18a44241839fbcf8b5e2a82603ce9fbef9 Mon Sep 17 00:00:00 2001
From: joaquinpereyra98 <24190917+joaquinpereyra98@users.noreply.github.com>
Date: Sat, 19 Jul 2025 17:21:46 -0300
Subject: [PATCH 4/4] Bug/103 enrich htmlfield content before its used in
 applications (#369)

* FIX: Add enritch to HTMLField
FIX: Remove no-HTMLField from Manifest
FIX: Convert Scar's HTMLField to StringField
FIX: Remove unused HTMLField

* REMOVE unused hanldebars helpers

* FEAT: add inventory-fieldset-items-V2 and inventory-item-V2  partials for Actors

* FIX showLabels to hideTags

* FEAT: add template to items sheet

* FEAT: add effects tabs on ItemSheet

* FEAT: add context menus for all inventory-items

* FEAT: add resources to inventory-item template

* FEAT: add enritch on inventory-item description
FEAT: add extensible behavior on inventory-item-content
FEAT: add fade effect on item-img to roll-itmg

* FEAT: add eritch to NPC description
FIX: missing htmlFieldss on manfiest
FIX: add misisng localizations

* FIX_ minor fixes

* Little resource fix. Noone will notice ._.

* FIX: remove default list styles
FIX: .extended css reduce max-height, shorten animation duration to 0.5s, and set overflow to auto.
FIX: set enriched=notes.enriche on notes.hbs
FIX: set experience.value on sidebar.hbs
FIX: move tooltip from item-img to img-portrait on inventory-item-V2.hbs
REMOVE: unused files

---------

Co-authored-by: Joaquin Pereyra <joaquinpereyra98@users.noreply.github.com>
Co-authored-by: WBHarry <williambjrklund@gmail.com>
---
 daggerheart.mjs                               |   2 +-
 lang/en.json                                  |  21 +-
 .../sheets-configs/action-config.mjs          |   2 +-
 .../sheets-configs/environment-settings.mjs   |  53 +--
 .../applications/sheets/actors/adversary.mjs  | 104 +++--
 .../applications/sheets/actors/character.mjs  | 358 ++++++---------
 .../applications/sheets/actors/companion.mjs  |  54 +--
 .../sheets/actors/environment.mjs             |  86 ++--
 .../sheets/api/application-mixin.mjs          | 432 ++++++++++++++++--
 module/applications/sheets/api/base-actor.mjs |  92 +++-
 module/applications/sheets/api/base-item.mjs  | 210 ++++-----
 module/applications/sheets/items/ancestry.mjs |  18 -
 module/applications/sheets/items/armor.mjs    |   6 +-
 .../applications/sheets/items/beastform.mjs   |  16 -
 module/applications/sheets/items/class.mjs    |  65 +--
 .../applications/sheets/items/community.mjs   |   2 +-
 .../applications/sheets/items/consumable.mjs  |   4 +
 module/applications/sheets/items/feature.mjs  | 102 +----
 .../sheets/items/miscellaneous.mjs            |   4 +
 module/applications/sheets/items/subclass.mjs |  58 +--
 module/applications/sheets/items/weapon.mjs   |   6 +-
 module/applications/ux/contextMenu.mjs        |   2 +-
 module/data/actor/character.mjs               |   2 +-
 module/data/actor/companion.mjs               |   1 +
 module/helpers/handlebarsHelper.mjs           |   4 +-
 module/helpers/utils.mjs                      |  12 +
 module/systemRegistration/handlebars.mjs      |   6 +-
 styles/less/global/inventory-item.less        | 197 +++++---
 system.json                                   |  12 +-
 .../adversary-settings/features.hbs           |   4 +-
 .../environment-settings/adversaries.hbs      |  51 ++-
 .../environment-settings/features.hbs         |   4 +-
 templates/sheets/actors/adversary/effects.hbs |  26 +-
 .../sheets/actors/adversary/features.hbs      |  16 +-
 templates/sheets/actors/adversary/header.hbs  |   2 +-
 templates/sheets/actors/adversary/notes.hbs   |   2 +-
 templates/sheets/actors/adversary/sidebar.hbs |  93 ++--
 .../sheets/actors/character/biography.hbs     |   4 +-
 templates/sheets/actors/character/effects.hbs |  27 +-
 .../sheets/actors/character/features.hbs      |  30 +-
 templates/sheets/actors/character/header.hbs  |  12 +-
 .../sheets/actors/character/inventory.hbs     |  59 ++-
 templates/sheets/actors/character/loadout.hbs |  27 +-
 templates/sheets/actors/character/sidebar.hbs |  67 ++-
 templates/sheets/actors/companion/details.hbs |  47 +-
 templates/sheets/actors/companion/effects.hbs |  26 +-
 .../sheets/actors/environment/features.hbs    |   9 +-
 .../sheets/actors/environment/header.hbs      |   2 +-
 templates/sheets/actors/environment/notes.hbs |   2 +-
 .../environment/potentialAdversaries.hbs      |  13 +-
 .../global/partials/domain-card-item.hbs      |  40 +-
 .../global/partials/feature-section-item.hbs  |  30 +-
 .../partials/inventory-fieldset-items-V2.hbs  |  70 +++
 .../partials/inventory-fieldset-items.hbs     |  44 --
 .../global/partials/inventory-item-V2.hbs     | 239 ++++++++++
 .../sheets/global/partials/inventory-item.hbs | 197 --------
 templates/sheets/global/tabs/tab-actions.hbs  |  25 +-
 templates/sheets/global/tabs/tab-effects.hbs  |  45 +-
 .../global/tabs/tab-feature-section.hbs       |  14 -
 templates/sheets/global/tabs/tab-features.hbs |  32 +-
 templates/sheets/items/class/settings.hbs     |  12 +-
 61 files changed, 1768 insertions(+), 1434 deletions(-)
 create mode 100644 templates/sheets/global/partials/inventory-fieldset-items-V2.hbs
 delete mode 100644 templates/sheets/global/partials/inventory-fieldset-items.hbs
 create mode 100644 templates/sheets/global/partials/inventory-item-V2.hbs
 delete mode 100644 templates/sheets/global/partials/inventory-item.hbs
 delete mode 100644 templates/sheets/global/tabs/tab-feature-section.hbs

diff --git a/daggerheart.mjs b/daggerheart.mjs
index 22586e90..9239d338 100644
--- a/daggerheart.mjs
+++ b/daggerheart.mjs
@@ -66,7 +66,7 @@ Hooks.once('init', () => {
     CONFIG.Token.documentClass = documents.DhToken;
     CONFIG.Token.prototypeSheetClass = applications.sheetConfigs.DhPrototypeTokenConfig;
     DocumentSheetConfig.unregisterSheet(TokenDocument, 'core', foundry.applications.sheets.TokenConfig);
-    DocumentSheetConfig.registerSheet(TokenDocument, 'dnd5e', applications.sheetConfigs.DhTokenConfig, {
+    DocumentSheetConfig.registerSheet(TokenDocument, SYSTEM.id, applications.sheetConfigs.DhTokenConfig, {
         makeDefault: true
     });
 
diff --git a/lang/en.json b/lang/en.json
index 9f929c77..7e25f0d2 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -108,15 +108,6 @@
             "Character": {
                 "age": "Age",
                 "companionFeatures": "Companion Features",
-                "contextMenu": {
-                    "consume": "Consume Item",
-                    "equip": "Equip",
-                    "sendToChat": "Send To Chat",
-                    "toLoadout": "Send to Loadout",
-                    "toVault": "Send to Vault",
-                    "unequip": "Unequip",
-                    "useItem": "Use Item"
-                },
                 "faith": "Faith",
                 "levelUp": "You can level up",
                 "pronouns": "Pronouns",
@@ -206,6 +197,16 @@
                 "requestingSpotlight": "Requesting The Spotlight",
                 "requestSpotlight": "Request The Spotlight"
             },
+            "ContextMenu": {
+                "disableEffect": "Disable Effect",
+                "enableEffect": "Enable Effect",
+                "equip": "Equip",
+                "sendToChat": "Send To Chat",
+                "toLoadout": "Send to Loadout",
+                "toVault": "Send to Vault",
+                "unequip": "Unequip",
+                "useItem": "Use Item"
+            },
             "Countdown": {
                 "addCountdown": "Add Countdown",
                 "FIELDS": {
@@ -1581,6 +1582,8 @@
                 "featureNotMastery": "This feature is used as something else than a Mastery feature and cannot be used here."
             },
             "Tooltip": {
+                "disableEffect": "Disable Effect",
+                "enableEffect": "Enable Effect",
                 "openItemWorld": "Open Item World",
                 "openActorWorld": "Open Actor World",
                 "sendToChat": "Send to Chat",
diff --git a/module/applications/sheets-configs/action-config.mjs b/module/applications/sheets-configs/action-config.mjs
index e1a62e0d..db3c4d27 100644
--- a/module/applications/sheets-configs/action-config.mjs
+++ b/module/applications/sheets-configs/action-config.mjs
@@ -109,7 +109,7 @@ export default class DHActionConfig extends DaggerheartSheet(ApplicationV2) {
         context.getEffectDetails = this.getEffectDetails.bind(this);
         context.costOptions = this.getCostOptions();
         context.disableOption = this.disableOption.bind(this);
-        context.isNPC = this.action.actor && this.action.actor.type !== 'character';
+        context.isNPC = this.action.actor?.isNPC;
         context.hasRoll = this.action.hasRoll;
 
         const settingsTiers = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.LevelTiers).tiers;
diff --git a/module/applications/sheets-configs/environment-settings.mjs b/module/applications/sheets-configs/environment-settings.mjs
index 7422f5fc..c249d6d5 100644
--- a/module/applications/sheets-configs/environment-settings.mjs
+++ b/module/applications/sheets-configs/environment-settings.mjs
@@ -1,3 +1,4 @@
+import { getDocFromElement } from '../../helpers/utils.mjs';
 import DHBaseActorSettings from '../sheets/api/actor-setting.mjs';
 
 /**@typedef {import('@client/applications/_types.mjs').ApplicationClickAction} ApplicationClickAction */
@@ -9,8 +10,7 @@ export default class DHEnvironmentSettings extends DHBaseActorSettings {
         actions: {
             addCategory: DHEnvironmentSettings.#addCategory,
             removeCategory: DHEnvironmentSettings.#removeCategory,
-            viewAdversary: this.#viewAdversary,
-            deleteAdversary: this.#deleteAdversary
+            deleteAdversary: DHEnvironmentSettings.#deleteAdversary
         },
         dragDrop: [
             { dragSelector: null, dropSelector: '.category-container' },
@@ -69,37 +69,30 @@ export default class DHEnvironmentSettings extends DHBaseActorSettings {
         await this.actor.update({ [`system.potentialAdversaries.-=${target.dataset.categoryId}`]: null });
     }
 
-    static async #viewAdversary(_, button) {
-        const adversary = await foundry.utils.fromUuid(button.dataset.adversary);
-        if (!adversary) {
-            ui.notifications.warn(game.i18n.localize('DAGGERHEART.UI.Notifications.adversaryMissing'));
-            return;
-        }
+    /**
+     * 
+     * @type {ApplicationClickAction}
+     * @returns 
+     */
+    static async #deleteAdversary(_event, target) {
+        const doc = getDocFromElement(target);
+        const { category } = target.dataset;
+        const path = `system.potentialAdversaries.${category}.adversaries`;
 
-        adversary.sheet.render({ force: true });
-    }
+        const confirmed = await foundry.applications.api.DialogV2.confirm({
+            window: {
+                title: game.i18n.format('DAGGERHEART.APPLICATIONS.DeleteConfirmation.title', {
+                    type: game.i18n.localize('TYPES.Actor.adversary'),
+                    name: doc.name
+                })
+            },
+            content: game.i18n.format('DAGGERHEART.APPLICATIONS.DeleteConfirmation.text', { name: doc.name })
+        });
 
-    static async #deleteAdversary(event, target) {
-        const adversaryKey = target.dataset.adversary;
-        const path = `system.potentialAdversaries.${target.dataset.potentialAdversary}.adversaries`;
-        const property = foundry.utils.getProperty(this.actor, path);
-        const adversary = property.find(x => (x?.uuid ?? x) === adversaryKey);
+        if (!confirmed) return;
 
-        if (adversary) {
-            const confirmed = await foundry.applications.api.DialogV2.confirm({
-                window: {
-                    title: game.i18n.format('DAGGERHEART.APPLICATIONS.DeleteConfirmation.title', {
-                        type: game.i18n.localize('TYPES.Actor.adversary'),
-                        name: adversary.name
-                    })
-                },
-                content: game.i18n.format('DAGGERHEART.APPLICATIONS.DeleteConfirmation.text', { name: adversary.name })
-            });
-
-            if (!confirmed) return;
-        }
-
-        const newAdversaries = property.filter(x => x && (x?.uuid ?? x) !== adversaryKey);
+        const adversaries = foundry.utils.getProperty(this.actor, path);
+        const newAdversaries = adversaries.filter(a => a.uuid !== doc.uuid);
         await this.actor.update({ [path]: newAdversaries });
     }
 
diff --git a/module/applications/sheets/actors/adversary.mjs b/module/applications/sheets/actors/adversary.mjs
index af89abe6..e6508695 100644
--- a/module/applications/sheets/actors/adversary.mjs
+++ b/module/applications/sheets/actors/adversary.mjs
@@ -9,9 +9,6 @@ export default class AdversarySheet extends DHBaseActorSheet {
         window: { resizable: true },
         actions: {
             reactionRoll: AdversarySheet.#reactionRoll,
-            useItem: this.useItem,
-            useAction: this.useItem,
-            toChat: this.toChat
         },
         window: {
             resizable: true
@@ -29,7 +26,7 @@ export default class AdversarySheet extends DHBaseActorSheet {
     /** @inheritdoc */
     static TABS = {
         primary: {
-            tabs: [{ id: 'features' }, { id: 'notes' }, { id: 'effects' }],
+            tabs: [{ id: 'features' }, { id: 'effects' }, { id: 'notes' }],
             initial: 'features',
             labelPrefix: 'DAGGERHEART.GENERAL.Tabs'
         }
@@ -42,10 +39,63 @@ export default class AdversarySheet extends DHBaseActorSheet {
         return context;
     }
 
-    getItem(element) {
-        const itemId = (element.target ?? element).closest('[data-item-id]').dataset.itemId,
-            item = this.document.items.get(itemId);
-        return item;
+    /**@inheritdoc */
+    async _preparePartContext(partId, context, options) {
+        context = await super._preparePartContext(partId, context, options);
+        switch (partId) {
+            case 'header':
+                await this._prepareHeaderContext(context, options);
+                break;
+            case 'notes':
+                await this._prepareNotesContext(context, options);
+                break;
+        }
+        return context;
+    }
+
+    /**
+     * Prepare render context for the Biography part.
+     * @param {ApplicationRenderContext} context
+     * @param {ApplicationRenderOptions} options
+     * @returns {Promise<void>}
+     * @protected
+     */
+    async _prepareNotesContext(context, _options) {
+        const { system } = this.document;
+        const { TextEditor } = foundry.applications.ux;
+
+        const paths = {
+            notes: 'notes'
+        };
+
+        for (const [key, path] of Object.entries(paths)) {
+            const value = foundry.utils.getProperty(system, path);
+            context[key] = {
+                field: system.schema.getField(path),
+                value,
+                enriched: await TextEditor.implementation.enrichHTML(value, {
+                    secrets: this.document.isOwner,
+                    relativeTo: this.document
+                })
+            };
+        }
+    }
+
+    /**
+     * Prepare render context for the Header part.
+     * @param {ApplicationRenderContext} context
+     * @param {ApplicationRenderOptions} options
+     * @returns {Promise<void>}
+     * @protected
+     */
+    async _prepareHeaderContext(context, _options) {
+        const { system } = this.document;
+        const { TextEditor } = foundry.applications.ux;
+
+        context.description = await TextEditor.implementation.enrichHTML(system.description, {
+            secrets: this.document.isOwner,
+            relativeTo: this.document
+        });
     }
 
     /* -------------------------------------------- */
@@ -73,42 +123,4 @@ export default class AdversarySheet extends DHBaseActorSheet {
 
         this.actor.diceRoll(config);
     }
-
-    /**
-     *
-     * @type {ApplicationClickAction}
-     */
-    static async useItem(event) {
-        const action = this.getItem(event) ?? this.actor.system.attack;
-        action.use(event);
-    }
-
-    /**
-     *
-     * @type {ApplicationClickAction}
-     */
-    static async toChat(event, button) {
-        if (button?.dataset?.type === 'experience') {
-            const experience = this.document.system.experiences[button.dataset.uuid];
-            const cls = getDocumentClass('ChatMessage');
-            const systemData = {
-                name: game.i18n.localize('DAGGERHEART.GENERAL.Experience.single'),
-                description: `${experience.name} ${experience.value.signedString()}`
-            };
-            const msg = new cls({
-                type: 'abilityUse',
-                user: game.user.id,
-                system: systemData,
-                content: await foundry.applications.handlebars.renderTemplate(
-                    'systems/daggerheart/templates/ui/chat/ability-use.hbs',
-                    systemData
-                )
-            });
-
-            cls.create(msg.toObject());
-        } else {
-            const item = this.getItem(event) ?? this.document.system.attack;
-            item.toChat(this.document.id);
-        }
-    }
 }
diff --git a/module/applications/sheets/actors/character.mjs b/module/applications/sheets/actors/character.mjs
index 0f6f8284..8f157c96 100644
--- a/module/applications/sheets/actors/character.mjs
+++ b/module/applications/sheets/actors/character.mjs
@@ -4,7 +4,7 @@ import { abilities } from '../../../config/actorConfig.mjs';
 import DhCharacterlevelUp from '../../levelup/characterLevelup.mjs';
 import DhCharacterCreation from '../../characterCreation/characterCreation.mjs';
 import FilterMenu from '../../ux/filter-menu.mjs';
-import { itemAbleRollParse } from '../../../helpers/utils.mjs';
+import { getDocFromElement, itemAbleRollParse } from '../../../helpers/utils.mjs';
 
 /**@typedef {import('@client/applications/_types.mjs').ApplicationClickAction} ApplicationClickAction */
 
@@ -15,7 +15,6 @@ export default class CharacterSheet extends DHBaseActorSheet {
         classes: ['character'],
         position: { width: 850, height: 800 },
         actions: {
-            triggerContextMenu: CharacterSheet.#triggerContextMenu,
             toggleVault: CharacterSheet.#toggleVault,
             rollAttribute: CharacterSheet.#rollAttribute,
             toggleHope: CharacterSheet.#toggleHope,
@@ -24,11 +23,8 @@ export default class CharacterSheet extends DHBaseActorSheet {
             makeDeathMove: CharacterSheet.#makeDeathMove,
             levelManagement: CharacterSheet.#levelManagement,
             toggleEquipItem: CharacterSheet.#toggleEquipItem,
-            useItem: this.useItem, //TODO Fix this
-            useAction: this.useAction,
-            toggleResourceDice: this.toggleResourceDice,
-            handleResourceDice: this.handleResourceDice,
-            toChat: this.toChat,
+            toggleResourceDice: CharacterSheet.#toggleResourceDice,
+            handleResourceDice: CharacterSheet.#handleResourceDice,
             useDowntime: this.useDowntime
         },
         window: {
@@ -42,8 +38,24 @@ export default class CharacterSheet extends DHBaseActorSheet {
         ],
         contextMenus: [
             {
-                handler: CharacterSheet._getContextMenuOptions,
-                selector: '[data-item-id]',
+                handler: CharacterSheet.#getDomainCardContextOptions,
+                selector: '[data-item-uuid][data-type="domainCard"]',
+                options: {
+                    parentClassHooks: false,
+                    fixed: true
+                }
+            },
+            {
+                handler: CharacterSheet.#getEquipamentContextOptions,
+                selector: '[data-item-uuid][data-type="armor"], [data-item-uuid][data-type="weapon"]',
+                options: {
+                    parentClassHooks: false,
+                    fixed: true
+                }
+            },
+            {
+                handler: CharacterSheet.#getItemContextOptions,
+                selector: '[data-item-uuid][data-type="consumable"], [data-item-uuid][data-type="miscellaneous"]',
                 options: {
                     parentClassHooks: false,
                     fixed: true
@@ -123,20 +135,6 @@ export default class CharacterSheet extends DHBaseActorSheet {
         this._createSearchFilter();
     }
 
-    /* -------------------------------------------- */
-
-    getItem(element) {
-        const listElement = (element.target ?? element).closest('[data-item-id]');
-        const itemId = listElement.dataset.itemId;
-
-        switch (listElement.dataset.type) {
-            case 'effect':
-                return this.document.effects.get(itemId);
-            default:
-                return this.document.items.get(itemId);
-        }
-    }
-
     /* -------------------------------------------- */
     /*  Prepare Context                             */
     /* -------------------------------------------- */
@@ -186,124 +184,135 @@ export default class CharacterSheet extends DHBaseActorSheet {
             case 'sidebar':
                 await this._prepareSidebarContext(context, options);
                 break;
+            case 'biography':
+                await this._prepareBiographyContext(context, options);
+                break;
         }
         return context;
     }
 
+    /**
+     * Prepare render context for the Loadout part.
+     * @param {ApplicationRenderContext} context
+     * @param {ApplicationRenderOptions} options
+     * @returns {Promise<void>}
+     * @protected
+     */
     async _prepareLoadoutContext(context, _options) {
-        context.listView = game.user.getFlag(CONFIG.DH.id, CONFIG.DH.FLAGS.displayDomainCardsAsList);
+        context.cardView = !game.user.getFlag(CONFIG.DH.id, CONFIG.DH.FLAGS.displayDomainCardsAsList);
     }
 
+    /**
+     * Prepare render context for the Sidebar part.
+     * @param {ApplicationRenderContext} context
+     * @param {ApplicationRenderOptions} options
+     * @returns {Promise<void>}
+     * @protected
+     */
     async _prepareSidebarContext(context, _options) {
         context.isDeath = this.document.system.deathMoveViable;
     }
 
+    /**
+     * Prepare render context for the Biography part.
+     * @param {ApplicationRenderContext} context
+     * @param {ApplicationRenderOptions} options
+     * @returns {Promise<void>}
+     * @protected
+     */
+    async _prepareBiographyContext(context, _options) {
+        const { system } = this.document;
+        const { TextEditor } = foundry.applications.ux;
+
+        const paths = {
+            background: 'biography.background',
+            connections: 'biography.connections'
+        };
+
+        for (const [key, path] of Object.entries(paths)) {
+            const value = foundry.utils.getProperty(system, path);
+            context[key] = {
+                field: system.schema.getField(path),
+                value,
+                enriched: await TextEditor.implementation.enrichHTML(value, {
+                    secrets: this.document.isOwner,
+                    relativeTo: this.document
+                })
+            };
+        }
+    }
+
     /* -------------------------------------------- */
     /*  Context Menu                                */
     /* -------------------------------------------- */
 
     /**
-     * Get the set of ContextMenu options.
+     * Get the set of ContextMenu options for DomainCards.
      * @returns {import('@client/applications/ux/context-menu.mjs').ContextMenuEntry[]} - The Array of context options passed to the ContextMenu instance
      * @this {CharacterSheet}
      * @protected
      */
-    static _getContextMenuOptions() {
-        /**
-         * Get the item from the element.
-         * @param {HTMLElement} el
-         * @returns {foundry.documents.Item?}
-         */
-        const getItem = element => {
-            const listElement = (element.target ?? element).closest('[data-item-id]');
-            const itemId = listElement.dataset.itemId;
-
-            switch (listElement.dataset.type) {
-                case 'effect':
-                    return this.document.effects.get(itemId);
-                default:
-                    return this.document.items.get(itemId);
+    static #getDomainCardContextOptions() {
+        /**@type {import('@client/applications/ux/context-menu.mjs').ContextMenuEntry[]} */
+        const options = [
+            {
+                name: 'toLoadout',
+                icon: 'fa-solid fa-arrow-up',
+                condition: target => getDocFromElement(target).system.inVault,
+                callback: target => getDocFromElement(target).update({ 'system.inVault': false })
+            },
+            {
+                name: 'toVault',
+                icon: 'fa-solid fa-arrow-down',
+                condition: target => !getDocFromElement(target).system.inVault,
+                callback: target => getDocFromElement(target).update({ 'system.inVault': true })
             }
-        };
+        ].map(option => ({
+            ...option,
+            name: `DAGGERHEART.APPLICATIONS.ContextMenu.${option.name}`,
+            icon: `<i class="${option.icon}"></i>`
+        }));
 
-        return [
-            {
-                name: 'DAGGERHEART.ACTORS.Character.contextMenu.useItem',
-                icon: '<i class="fa-solid fa-burst"></i>',
-                condition: el => {
-                    const item = getItem(el);
-                    return !['class', 'subclass'].includes(item.type);
-                },
-                callback: (button, event) => CharacterSheet.useItem.call(this, event, button)
-            },
-            {
-                name: 'DAGGERHEART.ACTORS.Character.contextMenu.equip',
-                icon: '<i class="fa-solid fa-hands"></i>',
-                condition: el => {
-                    const item = getItem(el);
-                    return ['weapon', 'armor'].includes(item.type) && !item.system.equipped;
-                },
-                callback: CharacterSheet.#toggleEquipItem.bind(this)
-            },
-            {
-                name: 'DAGGERHEART.ACTORS.Character.contextMenu.unequip',
-                icon: '<i class="fa-solid fa-hands"></i>',
-                condition: el => {
-                    const item = getItem(el);
-                    return ['weapon', 'armor'].includes(item.type) && item.system.equipped;
-                },
-                callback: CharacterSheet.#toggleEquipItem.bind(this)
-            },
-            {
-                name: 'DAGGERHEART.ACTORS.Character.contextMenu.toLoadout',
-                icon: '<i class="fa-solid fa-arrow-up"></i>',
-                condition: el => {
-                    const item = getItem(el);
-                    return ['domainCard'].includes(item.type) && item.system.inVault;
-                },
-                callback: target => getItem(target).update({ 'system.inVault': false })
-            },
-            {
-                name: 'DAGGERHEART.ACTORS.Character.contextMenu.toVault',
-                icon: '<i class="fa-solid fa-arrow-down"></i>',
-                condition: el => {
-                    const item = getItem(el);
-                    return ['domainCard'].includes(item.type) && !item.system.inVault;
-                },
-                callback: target => getItem(target).update({ 'system.inVault': true })
-            },
-            {
-                name: 'DAGGERHEART.ACTORS.Character.contextMenu.sendToChat',
-                icon: '<i class="fa-regular fa-message"></i>',
-                callback: CharacterSheet.toChat.bind(this)
-            },
-            {
-                name: 'CONTROLS.CommonEdit',
-                icon: '<i class="fa-solid fa-pen-to-square"></i>',
-                callback: target => getItem(target).sheet.render({ force: true })
-            },
-            {
-                name: 'CONTROLS.CommonDelete',
-                icon: '<i class="fa-solid fa-trash"></i>',
-                callback: async el => {
-                    const item = getItem(el);
-                    const confirmed = await foundry.applications.api.DialogV2.confirm({
-                        window: {
-                            title: game.i18n.format('DAGGERHEART.APPLICATIONS.DeleteConfirmation.title', {
-                                type: game.i18n.localize(`TYPES.${item.documentName}.${item.type}`),
-                                name: item.name
-                            })
-                        },
-                        content: game.i18n.format('DAGGERHEART.APPLICATIONS.DeleteConfirmation.text', {
-                            name: item.name
-                        })
-                    });
-                    if (!confirmed) return;
+        return [...options, ...this._getContextMenuCommonOptions.call(this, { usable: true, toChat: true })];
+    }
 
-                    item.delete();
-                }
+    /**
+     * Get the set of ContextMenu options for Armors and Weapons.
+     * @returns {import('@client/applications/ux/context-menu.mjs').ContextMenuEntry[]} - The Array of context options passed to the ContextMenu instance
+     * @this {CharacterSheet}
+     * @protected
+     */
+    static #getEquipamentContextOptions() {
+        const options = [
+            {
+                name: 'equip',
+                icon: 'fa-solid fa-hands',
+                condition: target => !getDocFromElement(target).system.equipped,
+                callback: (target, event) => CharacterSheet.#toggleEquipItem.call(this, event, target)
+            },
+            {
+                name: 'unequip',
+                icon: 'fa-solid fa-hands',
+                condition: target => getDocFromElement(target).system.equipped,
+                callback: (target, event) => CharacterSheet.#toggleEquipItem.call(this, event, target)
             }
-        ];
+        ].map(option => ({
+            ...option,
+            name: `DAGGERHEART.APPLICATIONS.ContextMenu.${option.name}`,
+            icon: `<i class="${option.icon}"></i>`
+        }));
+
+        return [...options, ...this._getContextMenuCommonOptions.call(this, { usable: true, toChat: true })];
+    }
+
+    /**
+     * Get the set of ContextMenu options for Consumable and Miscellaneous.
+     * @returns {import('@client/applications/ux/context-menu.mjs').ContextMenuEntry[]} - The Array of context options passed to the ContextMenu instance
+     * @this {CharacterSheet}
+     * @protected
+     */
+    static #getItemContextOptions() {
+        return this._getContextMenuCommonOptions.call(this, { usable: true, toChat: true });
     }
     /* -------------------------------------------- */
     /*  Filter Tracking                             */
@@ -397,7 +406,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
         this.#filteredItems.inventory.search.clear();
 
         for (const li of html.querySelectorAll('.inventory-item')) {
-            const item = this.document.items.get(li.dataset.itemId);
+            const item = getDocFromElement(li);
             const matchesSearch = !query || foundry.applications.ux.SearchFilter.testQuery(rgx, item.name);
             if (matchesSearch) this.#filteredItems.inventory.search.add(item.id);
             const { menu } = this.#filteredItems.inventory;
@@ -417,7 +426,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
         this.#filteredItems.loadout.search.clear();
 
         for (const li of html.querySelectorAll('.items-list .inventory-item, .card-list .card-item')) {
-            const item = this.document.items.get(li.dataset.itemId);
+            const item = getDocFromElement(li);
             const matchesSearch = !query || foundry.applications.ux.SearchFilter.testQuery(rgx, item.name);
             if (matchesSearch) this.#filteredItems.loadout.search.add(item.id);
             const { menu } = this.#filteredItems.loadout;
@@ -468,7 +477,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
         this.#filteredItems.inventory.menu.clear();
 
         for (const li of html.querySelectorAll('.inventory-item')) {
-            const item = this.document.items.get(li.dataset.itemId);
+            const item = getDocFromElement(li);
 
             const matchesMenu =
                 filters.length === 0 || filters.some(f => foundry.applications.ux.SearchFilter.evaluateFilter(item, f));
@@ -489,7 +498,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
         this.#filteredItems.loadout.menu.clear();
 
         for (const li of html.querySelectorAll('.items-list .inventory-item, .card-list .card-item')) {
-            const item = this.document.items.get(li.dataset.itemId);
+            const item = getDocFromElement(li);
 
             const matchesMenu =
                 filters.length === 0 || filters.some(f => foundry.applications.ux.SearchFilter.evaluateFilter(item, f));
@@ -503,22 +512,21 @@ export default class CharacterSheet extends DHBaseActorSheet {
     /* -------------------------------------------- */
     /*  Application Listener Actions                */
     /* -------------------------------------------- */
+
     async updateItemResource(event) {
-        const item = this.getItem(event.currentTarget);
+        const item = getDocFromElement(event.currentTarget);
         if (!item) return;
 
         const max = item.system.resource.max ? itemAbleRollParse(item.system.resource.max, this.document, item) : null;
         const value = max ? Math.min(Number(event.currentTarget.value), max) : event.currentTarget.value;
         await item.update({ 'system.resource.value': value });
-        this.render();
     }
 
     async updateItemQuantity(event) {
-        const item = this.getItem(event.currentTarget);
+        const item = getDocFromElement(event.currentTarget);
         if (!item) return;
 
         await item.update({ 'system.quantity': event.currentTarget.value });
-        this.render();
     }
 
     async updateArmorMarks(event) {
@@ -528,7 +536,6 @@ export default class CharacterSheet extends DHBaseActorSheet {
         const maxMarks = this.document.system.armorScore;
         const value = Math.min(Math.max(Number(event.currentTarget.value), 0), maxMarks);
         await armor.update({ 'system.marks.value': value });
-        this.render();
     }
 
     /* -------------------------------------------- */
@@ -588,13 +595,14 @@ export default class CharacterSheet extends DHBaseActorSheet {
         this.document.diceRoll(config);
     }
 
+    //TODO: redo toggleEquipItem method
+
     /**
      * Toggles the equipped state of an item (armor or weapon).
      * @type {ApplicationClickAction}
      */
     static async #toggleEquipItem(_event, button) {
-        //TODO: redo this
-        const item = this.actor.items.get(button.closest('[data-item-id]')?.dataset.itemId);
+        const item = getDocFromElement(button);
         if (!item) return;
         if (item.system.equipped) {
             await item.update({ 'system.equipped': false });
@@ -642,64 +650,23 @@ export default class CharacterSheet extends DHBaseActorSheet {
      * Toggles whether an item is stored in the vault.
      * @type {ApplicationClickAction}
      */
-    static async #toggleVault(event, button) {
-        const docId = button.closest('[data-item-id]')?.dataset.itemId;
-        const doc = this.document.items.get(docId);
+    static async #toggleVault(_event, button) {
+        const doc = getDocFromElement(button);
         await doc?.update({ 'system.inVault': !doc.system.inVault });
     }
 
-    /**
-     * Trigger the context menu.
-     * @type {ApplicationClickAction}
-     */
-    static #triggerContextMenu(event, _) {
-        return CONFIG.ux.ContextMenu.triggerContextMenu(event);
-    }
-
-    /**
-     * Use a item
-     * @type {ApplicationClickAction}
-     */
-    static async useItem(event, button) {
-        const item = this.getItem(button);
-        if (!item) return;
-
-        // Should dandle its actions. Or maybe they'll be separate buttons as per an Issue on the board
-        if (item.type === 'feature') {
-            item.use(event);
-        } else if (item instanceof ActiveEffect) {
-            item.toChat(this);
-        } else {
-            item.use(event);
-        }
-    }
-
-    /**
-     * Use an action
-     * @type {ApplicationClickAction}
-     */
-    static async useAction(event, button) {
-        const item = this.getItem(button);
-        if (!item) return;
-
-        const action = item.system.actions.find(x => x.id === button.dataset.actionId);
-        if (!action) return;
-
-        action.use(event);
-    }
-
     /**
      * Toggle the used state of a resource dice.
      * @type {ApplicationClickAction}
      */
-    static async toggleResourceDice(event) {
-        const target = event.target.closest('.item-resource');
-        const item = this.getItem(event);
-        if (!item) return;
+    static async #toggleResourceDice(event, target) {
+        const item = getDocFromElement(target);
+
+        const { dice } = event.target.closest('.item-resource').dataset;
+        const diceState = item.system.resource.diceStates[dice];
 
-        const diceState = item.system.resource.diceStates[target.dataset.dice];
         await item.update({
-            [`system.resource.diceStates.${target.dataset.dice}.used`]: diceState?.used ? !diceState.used : true
+            [`system.resource.diceStates.${dice}.used`]: diceState ? !diceState.used : true
         });
     }
 
@@ -707,8 +674,8 @@ export default class CharacterSheet extends DHBaseActorSheet {
      * Handle the roll values of resource dice.
      * @type {ApplicationClickAction}
      */
-    static async handleResourceDice(event) {
-        const item = this.getItem(event);
+    static async #handleResourceDice(_, target) {
+        const item = getDocFromElement(target);
         if (!item) return;
 
         const rollValues = await game.system.api.applications.dialogs.ResourceDiceDialog.create(item, this.document);
@@ -720,37 +687,6 @@ export default class CharacterSheet extends DHBaseActorSheet {
                 return acc;
             }, {})
         });
-        this.render();
-    }
-
-    /**
-     * Send item to Chat
-     * @type {ApplicationClickAction}
-     */
-    static async toChat(event, button) {
-        if (button?.dataset?.type === 'experience') {
-            const experience = this.document.system.experiences[button.dataset.uuid];
-            const cls = getDocumentClass('ChatMessage');
-            const systemData = {
-                name: game.i18n.localize('DAGGERHEART.GENERAL.Experience.single'),
-                description: `${experience.name} ${experience.value.signedString()}`
-            };
-            const msg = new cls({
-                type: 'abilityUse',
-                user: game.user.id,
-                system: systemData,
-                content: await foundry.applications.handlebars.renderTemplate(
-                    'systems/daggerheart/templates/ui/chat/ability-use.hbs',
-                    systemData
-                )
-            });
-
-            cls.create(msg.toObject());
-        } else {
-            const item = this.getItem(event);
-            if (!item) return;
-            item.toChat(this.document.id);
-        }
     }
 
     static useDowntime(_, button) {
@@ -760,7 +696,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
     }
 
     async _onDragStart(event) {
-        const item = this.getItem(event);
+        const item = getDocFromElement(event.target);
 
         const dragData = {
             type: item.documentName,
diff --git a/module/applications/sheets/actors/companion.mjs b/module/applications/sheets/actors/companion.mjs
index a1d00d96..87cfda27 100644
--- a/module/applications/sheets/actors/companion.mjs
+++ b/module/applications/sheets/actors/companion.mjs
@@ -6,11 +6,7 @@ export default class DhCompanionSheet extends DHBaseActorSheet {
     static DEFAULT_OPTIONS = {
         classes: ['actor', 'companion'],
         position: { width: 300 },
-        actions: {
-            viewActor: this.viewActor,
-            useItem: this.useItem,
-            toChat: this.toChat
-        }
+        actions: {}
     };
 
     static PARTS = {
@@ -29,52 +25,4 @@ export default class DhCompanionSheet extends DHBaseActorSheet {
             labelPrefix: 'DAGGERHEART.GENERAL.Tabs'
         }
     };
-
-    /* -------------------------------------------- */
-    /*  Application Clicks Actions                  */
-    /* -------------------------------------------- */
-
-    static async viewActor(_, button) {
-        const target = button.closest('[data-item-uuid]');
-        const actor = await foundry.utils.fromUuid(target.dataset.itemUuid);
-        if (!actor) return;
-
-        actor.sheet.render(true);
-    }
-
-    getAction(element) {
-        const itemId = (element.target ?? element).closest('[data-item-id]').dataset.itemId,
-            item = this.document.system.actions.find(x => x.id === itemId);
-        return item;
-    }
-
-    static async useItem(event) {
-        const action = this.getAction(event) ?? this.actor.system.attack;
-        action.use(event);
-    }
-
-    static async toChat(event, button) {
-        if (button?.dataset?.type === 'experience') {
-            const experience = this.document.system.experiences[button.dataset.uuid];
-            const cls = getDocumentClass('ChatMessage');
-            const systemData = {
-                name: game.i18n.localize('DAGGERHEART.GENERAL.Experience.single'),
-                description: `${experience.name} ${experience.value.signedString()}`
-            };
-            const msg = new cls({
-                type: 'abilityUse',
-                user: game.user.id,
-                system: systemData,
-                content: await foundry.applications.handlebars.renderTemplate(
-                    'systems/daggerheart/templates/ui/chat/ability-use.hbs',
-                    systemData
-                )
-            });
-
-            cls.create(msg.toObject());
-        } else {
-            const item = this.getAction(event) ?? this.document.system.attack;
-            item.toChat(this.document.id);
-        }
-    }
 }
diff --git a/module/applications/sheets/actors/environment.mjs b/module/applications/sheets/actors/environment.mjs
index 05958cf5..7a9c92ac 100644
--- a/module/applications/sheets/actors/environment.mjs
+++ b/module/applications/sheets/actors/environment.mjs
@@ -9,11 +9,7 @@ export default class DhpEnvironment extends DHBaseActorSheet {
         position: {
             width: 500
         },
-        actions: {
-            useItem: this.useItem,
-            useAction: this.useItem,
-            toChat: this.toChat
-        },
+        actions: {},
         dragDrop: [{ dragSelector: '.action-section .inventory-item', dropSelector: null }]
     };
 
@@ -36,47 +32,67 @@ export default class DhpEnvironment extends DHBaseActorSheet {
         }
     };
 
-    /* -------------------------------------------- */
-
-    getItem(element) {
-        const itemId = (element.target ?? element).closest('[data-item-id]').dataset.itemId,
-            item = this.document.items.get(itemId);
-        return item;
+    /**@inheritdoc */
+    async _preparePartContext(partId, context, options) {
+        context = await super._preparePartContext(partId, context, options);
+        switch (partId) {
+            case 'header':
+                await this._prepareHeaderContext(context, options);
+                break;
+            case 'notes':
+                await this._prepareNotesContext(context, options);
+                break;
+        }
+        return context;
     }
 
-    /* -------------------------------------------- */
-    /*  Application Clicks Actions                  */
-    /* -------------------------------------------- */
-
     /**
-     *
-     * @type {ApplicationClickAction}
+     * Prepare render context for the Biography part.
+     * @param {ApplicationRenderContext} context
+     * @param {ApplicationRenderOptions} options
+     * @returns {Promise<void>}
+     * @protected
      */
-    async viewAdversary(_, button) {
-        const target = button.closest('[data-item-uuid]');
-        const adversary = await foundry.utils.fromUuid(target.dataset.itemUuid);
-        if (!adversary) {
-            ui.notifications.warn(game.i18n.localize('DAGGERHEART.UI.Notifications.adversaryMissing'));
-            return;
-        }
+    async _prepareNotesContext(context, _options) {
+        const { system } = this.document;
+        const { TextEditor } = foundry.applications.ux;
 
-        adversary.sheet.render({ force: true });
-    }
+        const paths = {
+            notes: 'notes'
+        };
 
-    static async useItem(event, button) {
-        const action = this.getItem(event);
-        if (!action) {
-            await this.viewAdversary(event, button);
-        } else {
-            action.use(event);
+        for (const [key, path] of Object.entries(paths)) {
+            const value = foundry.utils.getProperty(system, path);
+            context[key] = {
+                field: system.schema.getField(path),
+                value,
+                enriched: await TextEditor.implementation.enrichHTML(value, {
+                    secrets: this.document.isOwner,
+                    relativeTo: this.document
+                })
+            };
         }
     }
 
-    static async toChat(event) {
-        const item = this.getItem(event);
-        item.toChat(this.document.id);
+    /**
+     * Prepare render context for the Header part.
+     * @param {ApplicationRenderContext} context
+     * @param {ApplicationRenderOptions} options
+     * @returns {Promise<void>}
+     * @protected
+     */
+    async _prepareHeaderContext(context, _options) {
+        const { system } = this.document;
+        const { TextEditor } = foundry.applications.ux;
+
+        context.description = await TextEditor.implementation.enrichHTML(system.description, {
+            secrets: this.document.isOwner,
+            relativeTo: this.document
+        });
     }
 
+    /* -------------------------------------------- */
+
     async _onDragStart(event) {
         const item = event.currentTarget.closest('.inventory-item');
 
diff --git a/module/applications/sheets/api/application-mixin.mjs b/module/applications/sheets/api/application-mixin.mjs
index 0e5f211d..b343eb62 100644
--- a/module/applications/sheets/api/application-mixin.mjs
+++ b/module/applications/sheets/api/application-mixin.mjs
@@ -1,5 +1,10 @@
 const { HandlebarsApplicationMixin } = foundry.applications.api;
-import { tagifyElement } from '../../../helpers/utils.mjs';
+import { getDocFromElement, tagifyElement } from '../../../helpers/utils.mjs';
+import DHActionConfig from '../../sheets-configs/action-config.mjs';
+
+/**
+ * @typedef {import('@client/applications/_types.mjs').ApplicationClickAction} ApplicationClickAction
+ */
 
 /**
  * @typedef {object} DragDropConfig
@@ -71,11 +76,32 @@ export default function DHApplicationMixin(Base) {
         static DEFAULT_OPTIONS = {
             classes: ['daggerheart', 'sheet', 'dh-style'],
             actions: {
+                triggerContextMenu: DHSheetV2.#triggerContextMenu,
                 createDoc: DHSheetV2.#createDoc,
                 editDoc: DHSheetV2.#editDoc,
-                deleteDoc: DHSheetV2.#deleteDoc
+                deleteDoc: DHSheetV2.#deleteDoc,
+                toChat: DHSheetV2.#toChat,
+                useItem: DHSheetV2.#useItem,
+                useAction: DHSheetV2.#useAction,
+                toggleEffect: DHSheetV2.#toggleEffect,
+                toggleExtended: DHSheetV2.#toggleExtended,
             },
-            contextMenus: [],
+            contextMenus: [{
+                handler: DHSheetV2.#getEffectContextOptions,
+                selector: '[data-item-uuid][data-type="effect"]',
+                options: {
+                    parentClassHooks: false,
+                    fixed: true
+                },
+            },
+            {
+                handler: DHSheetV2.#getActionContextOptions,
+                selector: '[data-item-uuid][data-type="action"]',
+                options: {
+                    parentClassHooks: false,
+                    fixed: true
+                }
+            }],
             dragDrop: [],
             tagifyConfigs: []
         };
@@ -99,6 +125,27 @@ export default function DHApplicationMixin(Base) {
             this._createTagifyElements(this.options.tagifyConfigs);
         }
 
+        /* -------------------------------------------- */
+        /*  Sync Parts                                  */
+        /* -------------------------------------------- */
+
+        /**@inheritdoc */
+        _syncPartState(partId, newElement, priorElement, state) {
+            super._syncPartState(partId, newElement, priorElement, state);
+            for (const el of priorElement.querySelectorAll(".extensible.extended")) {
+                const { actionId, itemUuid } = el.parentElement.dataset;
+                const selector = `${actionId ? `[data-action-id="${actionId}"]` : `[data-item-uuid="${itemUuid}"]`} .extensible`;
+                const newExtensible = newElement.querySelector(selector);
+
+                if (!newExtensible) continue;
+                newExtensible.classList.add("extended");
+                const descriptionElement = newExtensible.querySelector('.invetory-description');
+                if (descriptionElement) {
+                    this.#prepareInventoryDescription(newExtensible, descriptionElement);
+                }
+            }
+        }
+
         /* -------------------------------------------- */
         /*  Tags                                        */
         /* -------------------------------------------- */
@@ -162,14 +209,14 @@ export default function DHApplicationMixin(Base) {
          * @param {DragEvent} event
          * @protected
          */
-        _onDragStart(event) {}
+        _onDragStart(event) { }
 
         /**
          * Handle drop event.
          * @param {DragEvent} event
          * @protected
          */
-        _onDrop(event) {}
+        _onDrop(event) { }
 
         /* -------------------------------------------- */
         /*  Context Menu                                */
@@ -185,12 +232,140 @@ export default function DHApplicationMixin(Base) {
         /* -------------------------------------------- */
 
         /**
-         * Get the set of ContextMenu options which should be used for journal entry pages in the sidebar.
-         * @returns {import('@client/applications/ux/context-menu.mjs').ContextMenuEntry[]}
+         * Get the set of ContextMenu options for DomainCards.
+         * @returns {import('@client/applications/ux/context-menu.mjs').ContextMenuEntry[]} - The Array of context options passed to the ContextMenu instance
+         * @this {CharacterSheet}
          * @protected
          */
-        _getEntryContextOptions() {
-            return [];
+        static #getEffectContextOptions() {
+            /**@type {import('@client/applications/ux/context-menu.mjs').ContextMenuEntry[]} */
+            const options = [
+                {
+                    name: 'disableEffect',
+                    icon: 'fa-solid fa-lightbulb',
+                    condition: target => !getDocFromElement(target).disabled,
+                    callback: target => getDocFromElement(target).update({ disabled: true })
+                },
+                {
+                    name: 'enableEffect',
+                    icon: 'fa-regular fa-lightbulb',
+                    condition: target => getDocFromElement(target).disabled,
+                    callback: target => getDocFromElement(target).update({ disabled: false })
+                },
+            ].map(option => ({
+                ...option,
+                name: `DAGGERHEART.APPLICATIONS.ContextMenu.${option.name}`,
+                icon: `<i class="${option.icon}"></i>`
+            }));
+
+            return [...options, ...this._getContextMenuCommonOptions.call(this, { toChat: true })];
+        }
+
+        /**
+         * Get the set of ContextMenu options for Actions.
+         * @returns {import('@client/applications/ux/context-menu.mjs').ContextMenuEntry[]} - The Array of context options passed to the ContextMenu instance
+         * @this {DHSheetV2}
+         * @protected
+         */
+        static #getActionContextOptions() {
+            /**@type {import('@client/applications/ux/context-menu.mjs').ContextMenuEntry[]} */
+            const getAction = (target) => {
+                const { actionId } = target.closest('[data-action-id]').dataset;
+                const { actions, attack } = this.document.system;
+                return attack?.id === actionId ? attack : actions?.find(a => a.id === actionId);
+            };
+
+            const options = [
+                {
+                    name: 'DAGGERHEART.APPLICATIONS.ContextMenu.useItem',
+                    icon: 'fa-solid fa-burst',
+                    condition: this.document instanceof foundry.documents.Actor ||
+                        (this.document instanceof foundry.documents.Item && this.document.parent),
+                    callback: (target, event) => getAction(target).use(event),
+                },
+                {
+                    name: 'DAGGERHEART.APPLICATIONS.ContextMenu.sendToChat',
+                    icon: 'fa-solid fa-message',
+                    callback: (target) => getAction(target).toChat(this.document.id),
+                },
+                {
+                    name: 'CONTROLS.CommonEdit',
+                    icon: 'fa-solid fa-pen-to-square',
+                    callback: (target) => new DHActionConfig(getAction(target)).render({ force: true })
+                },
+                {
+                    name: 'CONTROLS.CommonDelete',
+                    icon: 'fa-solid fa-trash',
+                    condition: (target) => {
+                        const { actionId } = target.closest('[data-action-id]').dataset;
+                        const { attack } = this.document.system;
+                        return attack?.id !== actionId
+                    },
+                    callback: async (target) => {
+                        const action = getAction(target)
+                        const confirmed = await foundry.applications.api.DialogV2.confirm({
+                            window: {
+                                title: game.i18n.format('DAGGERHEART.APPLICATIONS.DeleteConfirmation.title', {
+                                    type: game.i18n.localize(`DAGGERHEART.GENERAL.Action.single`),
+                                    name: action.name
+                                })
+                            },
+                            content: game.i18n.format('DAGGERHEART.APPLICATIONS.DeleteConfirmation.text', { name: action.name })
+                        });
+                        if (!confirmed) return;
+
+                        return this.document.update({
+                            'system.actions': this.document.system.actions.filter((a) => a.id !== action.id)
+                        });
+                    }
+                }
+            ].map(option => ({
+                ...option,
+                icon: `<i class="${option.icon}"></i>`
+            }));
+
+            return options;
+        }
+
+        /**
+         * Get the set of ContextMenu options.
+         * @returns {import('@client/applications/ux/context-menu.mjs').ContextMenuEntry[]} - The Array of context options passed to the ContextMenu instance
+         */
+        _getContextMenuCommonOptions({ usable = false, toChat = false, deletable = true }) {
+            const options = [
+                {
+                    name: 'CONTROLS.CommonEdit',
+                    icon: 'fa-solid fa-pen-to-square',
+                    callback: target => getDocFromElement(target).sheet.render({ force: true })
+                },
+            ];
+
+            if (usable) options.unshift({
+                name: 'DAGGERHEART.APPLICATIONS.ContextMenu.useItem',
+                icon: 'fa-solid fa-burst',
+                callback: (target, event) => getDocFromElement(target).use(event),
+            });
+
+            if (toChat) options.unshift({
+                name: 'DAGGERHEART.APPLICATIONS.ContextMenu.sendToChat',
+                icon: 'fa-solid fa-message',
+                callback: (target) => getDocFromElement(target).toChat(this.document.id),
+            });
+
+            if (deletable) options.push({
+                name: 'CONTROLS.CommonDelete',
+                icon: 'fa-solid fa-trash',
+                callback: (target, event) => {
+                    const doc = getDocFromElement(target);
+                    if (event.shiftKey) return doc.delete();
+                    else return doc.deleteDialog();
+                }
+            })
+
+            return options.map(option => ({
+                ...option,
+                icon: `<i class="${option.icon}"></i>`
+            }))
         }
 
         /* -------------------------------------------- */
@@ -207,66 +382,229 @@ export default function DHApplicationMixin(Base) {
             return context;
         }
 
+        /* -------------------------------------------- */
+        /*  Prepare Descriptions                        */
+        /* -------------------------------------------- */
+
+        /**
+         * Prepares and enriches an inventory item or action description for display.
+         * @param {HTMLElement} extensibleElement - The parent element containing the description.
+         * @param {HTMLElement} descriptionElement - The element where the enriched description will be rendered.
+         * @returns {Promise<void>}
+         */
+        async #prepareInventoryDescription(extensibleElement, descriptionElement) {
+            const parent = extensibleElement.closest('[data-item-uuid], [data-action-id]');
+            const { actionId, itemUuid } = parent?.dataset || {};
+            if (!actionId && !itemUuid) return;
+
+            const doc = itemUuid
+                ? getDocFromElement(extensibleElement)
+                : this.document.system.attack?.id === actionId
+                    ? this.document.system.attack
+                    : this.document.system.actions?.find(a => a.id === actionId);
+            if (!doc) return;
+
+            const description = doc.system?.description ?? doc.description;
+            const isAction = !!actionId;
+            descriptionElement.innerHTML = await foundry.applications.ux.TextEditor.implementation.enrichHTML(description, {
+                relativeTo: isAction ? doc.parent : doc,
+                rollData: doc.getRollData?.(),
+                secrets: isAction ? doc.parent.isOwner : doc.isOwner
+            });
+        }
+
         /* -------------------------------------------- */
         /*  Application Clicks Actions                  */
         /* -------------------------------------------- */
 
         /**
          * Create an embedded document.
-         * @param {PointerEvent} event - The originating click event
-         * @param {HTMLElement} button - The capturing HTML element which defines the [data-action="removeAction"]
+         * @type {ApplicationClickAction}
          */
-        static async #createDoc(event, button) {
-            const { documentClass, type } = button.dataset;
-            const parent = this.document;
+        static async #createDoc(event, target) {
+            const { documentClass, type, inVault, disabled } = target.dataset;
+            const parentIsItem = this.document.documentName === 'Item';
+            const parent = parentIsItem && documentClass === 'Item' ? null : this.document;
 
-            const cls = getDocumentClass(documentClass);
-            return await cls.createDocuments(
-                [
-                    {
-                        name: cls.defaultName({ type, parent }),
-                        type
+            if (type === 'action') {
+                const { type: actionType } = await foundry.applications.api.DialogV2.input({
+                    window: { title: 'Select Action Type' },
+                    content: await foundry.applications.handlebars.renderTemplate(
+                        'systems/daggerheart/templates/actionTypes/actionType.hbs',
+                        { types: CONFIG.DH.ACTIONS.actionTypes }
+                    ),
+                    ok: {
+                        label: game.i18n.format('DOCUMENT.Create', {
+                            type: game.i18n.localize('DAGGERHEART.GENERAL.Action.single')
+                        }),
                     }
-                ],
-                { parent, renderSheet: !event.shiftKey }
-            );
+                }) ?? {};
+                if (!actionType) return;
+                const cls = game.system.api.models.actions.actionsTypes[actionType]
+                const action = new cls({
+                    _id: foundry.utils.randomID(),
+                    type: actionType,
+                    name: game.i18n.localize(CONFIG.DH.ACTIONS.actionTypes[actionType].name),
+                    ...cls.getSourceConfig(this.document)
+                },
+                    {
+                        parent: this.document
+                    }
+                );
+                await this.document.update({ 'system.actions': [...this.document.system.actions, action] });
+                await new DHActionConfig(this.document.system.actions[this.document.system.actions.length - 1]).render({
+                    force: true
+                });
+                return action;
+
+            } else {
+                const cls = getDocumentClass(documentClass);
+                const data = {
+                    name: cls.defaultName({ type, parent }),
+                    type,
+                }
+                if (inVault) data["system.inVault"] = true;
+                if (disabled) data.disabled = true;
+
+                const doc = await cls.create(data, { parent, renderSheet: !event.shiftKey });
+                if (parentIsItem && type === 'feature') {
+                    await this.document.update({
+                        'system.features': this.document.system.toObject().features.concat(doc.uuid)
+                    });
+                }
+                return doc;
+            }
+
         }
 
         /**
          * Renders an embedded document.
-         * @param {PointerEvent} event - The originating click event
-         * @param {HTMLElement} button - The capturing HTML element which defines the [data-action="removeAction"]
+         * @type {ApplicationClickAction}
          */
-        static #editDoc(_event, button) {
-            const { type, docId } = button.dataset;
-            this.document.getEmbeddedDocument(type, docId, { strict: true }).sheet.render({ force: true });
+        static #editDoc(_event, target) {
+            const doc = getDocFromElement(target);
+            if (doc) return doc.sheet.render({ force: true });
+
+            // TODO: REDO this
+            const { actionId } = target.closest('[data-action-id]').dataset;
+            const { actions, attack } = this.document.system;
+            const action = attack?.id === actionId ? attack : actions?.find(a => a.id === actionId);
+            new DHActionConfig(action).render({ force: true })
         }
 
         /**
          * Delete an embedded document.
-         * @param {PointerEvent} _event - The originating click event
-         * @param {HTMLElement} button - The capturing HTML element which defines the [data-action="removeAction"]
+         * @type {ApplicationClickAction}
          */
-        static async #deleteDoc(_event, button) {
-            const { type, docId } = button.dataset;
-            const document = this.document.getEmbeddedDocument(type, docId, { strict: true });
-            const typeName = game.i18n.localize(
-                document.type === 'base' ? `DOCUMENT.${type}` : `TYPES.${type}.${document.type}`
-            );
+        static async #deleteDoc(event, target) {
+            const doc = getDocFromElement(target);
 
-            const confirmed = await foundry.applications.api.DialogV2.confirm({
-                window: {
-                    title: game.i18n.format('DAGGERHEART.APPLICATIONS.DeleteConfirmation.title', {
-                        type: typeName,
-                        name: document.name
-                    })
-                },
-                content: game.i18n.format('DAGGERHEART.APPLICATIONS.DeleteConfirmation.text', { name: document.name })
+            if (doc) {
+                if (event.shiftKey) return doc.delete()
+                else return await doc.deleteDialog()
+            }
+
+            // TODO: REDO this
+            const { actionId } = target.closest('[data-action-id]').dataset;
+            const { actions, attack } = this.document.system;
+            if (attack?.id === actionId) return;
+            const action = actions.find(a => a.id === actionId);
+
+            if (!event.shiftKey) {
+                const confirmed = await foundry.applications.api.DialogV2.confirm({
+                    window: {
+                        title: game.i18n.format('DAGGERHEART.APPLICATIONS.DeleteConfirmation.title', {
+                            type: game.i18n.localize(`DAGGERHEART.GENERAL.Action.single`),
+                            name: action.name
+                        })
+                    },
+                    content: game.i18n.format('DAGGERHEART.APPLICATIONS.DeleteConfirmation.text', { name: action.name })
+                });
+                if (!confirmed) return;
+            }
+
+            return await this.document.update({
+                'system.actions': actions.filter((a) => a.id !== action.id)
             });
-            if (!confirmed) return;
-
-            await document.delete();
         }
+
+        /**
+         * Send item to Chat
+         * @type {ApplicationClickAction}
+         */
+        static async #toChat(_event, target) {
+            let doc = getDocFromElement(target);
+
+            // TODO: REDO this
+            if (!doc) {
+                const { actionId } = target.closest('[data-action-id]').dataset;
+                const { actions, attack } = this.document.system;
+                doc = attack?.id === actionId ? attack : actions?.find(a => a.id === actionId);
+            }
+            return doc.toChat(this.document.id);
+        }
+
+        /**
+         * Use a item
+         * @type {ApplicationClickAction}
+         */
+        static async #useItem(event, target) {
+            let doc = getDocFromElement(target);
+            // TODO: REDO this
+            if (!doc) {
+                const { actionId } = target.closest('[data-action-id]').dataset;
+                const { actions, attack } = this.document.system;
+                doc = attack?.id === actionId ? attack : actions?.find(a => a.id === actionId);
+                if(this.document instanceof foundry.documents.Item && !this.document.parent) return;
+            }
+
+            await doc.use(event);
+        }
+
+        /**
+         * Use a item
+         * @type {ApplicationClickAction}
+         */
+        static async #useAction(event, target) {
+            const doc = getDocFromElement(target);
+            const { actionId } = target.closest('[data-action-id]').dataset;
+            const { actions, attack } = doc.system;
+            const action = attack?.id === actionId ? attack : actions?.find(a => a.id === actionId);
+            await action.use(event);
+        }
+
+
+        /**
+         * Toggle a ActiveEffect
+         * @type {ApplicationClickAction}
+         */
+        static async #toggleEffect(_, target) {
+            const doc = getDocFromElement(target);
+            await doc.update({ disabled: !doc.disabled });
+        }
+
+        /**
+         * Trigger the context menu.
+         * @type {ApplicationClickAction}
+         */
+        static #triggerContextMenu(event, _) {
+            return CONFIG.ux.ContextMenu.triggerContextMenu(event);
+        }
+
+        /**
+         * Toggle the 'extended' class on the .extensible element inside inventory-item-content
+         * @type {ApplicationClickAction}
+         * @this {DHSheetV2}
+         */
+        static async #toggleExtended(_, target) {
+            const container = target.closest('.inventory-item');
+            const extensible = container?.querySelector('.extensible');
+            const t = extensible?.classList.toggle('extended');
+
+            const descriptionElement = extensible?.querySelector('.invetory-description');
+            if (t && !!descriptionElement) this.#prepareInventoryDescription(extensible, descriptionElement);
+        }
+
     }
 
     return DHSheetV2;
diff --git a/module/applications/sheets/api/base-actor.mjs b/module/applications/sheets/api/base-actor.mjs
index 78df0aac..56f00e9b 100644
--- a/module/applications/sheets/api/base-actor.mjs
+++ b/module/applications/sheets/api/base-actor.mjs
@@ -21,11 +21,24 @@ export default class DHBaseActorSheet extends DHApplicationMixin(ActorSheetV2) {
             submitOnChange: true
         },
         actions: {
-            openSettings: DHBaseActorSheet.#openSettings
+            openSettings: DHBaseActorSheet.#openSettings,
+            sendExpToChat: DHBaseActorSheet.#sendExpToChat,
         },
+        contextMenus: [
+            {
+                handler: DHBaseActorSheet.#getFeatureContextOptions,
+                selector: '[data-item-uuid][data-type="feature"]',
+                options: {
+                    parentClassHooks: false,
+                    fixed: true
+                }
+            }
+        ],
         dragDrop: [{ dragSelector: '.inventory-item[data-type="attack"]', dropSelector: null }]
     };
 
+    /* -------------------------------------------- */
+
     /**@type {typeof DHBaseActorSettings}*/
     #settingSheet;
 
@@ -35,6 +48,10 @@ export default class DHBaseActorSheet extends DHApplicationMixin(ActorSheetV2) {
         return (this.#settingSheet ??= SheetClass ? new SheetClass({ document: this.document }) : null);
     }
 
+    /* -------------------------------------------- */
+    /*  Prepare Context                             */
+    /* -------------------------------------------- */
+
     /**@inheritdoc */
     async _prepareContext(_options) {
         const context = await super._prepareContext(_options);
@@ -42,6 +59,56 @@ export default class DHBaseActorSheet extends DHApplicationMixin(ActorSheetV2) {
         return context;
     }
 
+
+    /**@inheritdoc */
+    async _preparePartContext(partId, context, options) {
+        context = await super._preparePartContext(partId, context, options);
+        switch (partId) {
+            case 'effects':
+                await this._prepareEffectsContext(context, options);
+                break;
+        }
+        return context;
+    }
+
+    /**
+     * Prepare render context for the Effect part.
+     * @param {ApplicationRenderContext} context
+     * @param {ApplicationRenderOptions} options
+     * @returns {Promise<void>}
+     * @protected
+     */
+    async _prepareEffectsContext(context, _options) {
+        context.effects = {
+            actives: [],
+            inactives: [],
+        };
+
+        for (const effect of this.actor.allApplicableEffects()) {
+            const list = effect.active ? context.effects.actives : context.effects.inactives;
+            list.push(effect);
+        }
+    }
+
+    /* -------------------------------------------- */
+    /*  Context Menu                                */
+    /* -------------------------------------------- */
+
+    /**
+     * Get the set of ContextMenu options for Features.
+     * @returns {import('@client/applications/ux/context-menu.mjs').ContextMenuEntry[]} - The Array of context options passed to the ContextMenu instance
+     * @this {DHSheetV2}
+     * @protected
+     */
+    static #getFeatureContextOptions() {
+        return this._getContextMenuCommonOptions.call(this, { usable: true, toChat: true });
+    }
+
+
+    /* -------------------------------------------- */
+    /*  Application Clicks Actions                  */
+    /* -------------------------------------------- */
+
     /**
      * Open the Actor Setting Sheet
      * @type {ApplicationClickAction}
@@ -50,6 +117,29 @@ export default class DHBaseActorSheet extends DHApplicationMixin(ActorSheetV2) {
         await this.settingSheet.render({ force: true });
     }
 
+    /**
+     * Send Experience to Chat
+     * @type {ApplicationClickAction}
+     */
+    static async #sendExpToChat(_, button) {
+        const experience = this.document.system.experiences[button.dataset.id];
+
+        const systemData = {
+            name: game.i18n.localize('DAGGERHEART.GENERAL.Experience.single'),
+            description: `${experience.name} ${experience.value.signedString()}`
+        };
+
+        foundry.documents.ChatMessage.implementation.create({
+            type: 'abilityUse',
+            user: game.user.id,
+            system: systemData,
+            content: await foundry.applications.handlebars.renderTemplate(
+                'systems/daggerheart/templates/ui/chat/ability-use.hbs',
+                systemData
+            )
+        });
+    }
+
     /* -------------------------------------------- */
     /*  Application Drag/Drop                       */
     /* -------------------------------------------- */
diff --git a/module/applications/sheets/api/base-item.mjs b/module/applications/sheets/api/base-item.mjs
index 723b4802..766b443c 100644
--- a/module/applications/sheets/api/base-item.mjs
+++ b/module/applications/sheets/api/base-item.mjs
@@ -1,4 +1,4 @@
-import DHActionConfig from '../../sheets-configs/action-config.mjs';
+import { getDocFromElement } from '../../../helpers/utils.mjs';
 import DHApplicationMixin from './application-mixin.mjs';
 
 const { ItemSheetV2 } = foundry.applications.sheets;
@@ -15,16 +15,14 @@ export default class DHBaseItemSheet extends DHApplicationMixin(ItemSheetV2) {
     static DEFAULT_OPTIONS = {
         classes: ['item'],
         position: { width: 600 },
+        window: { resizable: true },
         form: {
             submitOnChange: true
         },
         actions: {
-            addAction: DHBaseItemSheet.#addAction,
-            editAction: DHBaseItemSheet.#editAction,
             removeAction: DHBaseItemSheet.#removeAction,
             addFeature: DHBaseItemSheet.#addFeature,
-            editFeature: DHBaseItemSheet.#editFeature,
-            removeFeature: DHBaseItemSheet.#removeFeature,
+            deleteFeature: DHBaseItemSheet.#deleteFeature,
             addResource: DHBaseItemSheet.#addResource,
             removeResource: DHBaseItemSheet.#removeResource
         },
@@ -32,6 +30,16 @@ export default class DHBaseItemSheet extends DHApplicationMixin(ItemSheetV2) {
             { dragSelector: null, dropSelector: '.tab.features .drop-section' },
             { dragSelector: '.feature-item', dropSelector: null },
             { dragSelector: '.action-item', dropSelector: null }
+        ],
+        contextMenus: [
+            {
+                handler: DHBaseItemSheet.#getFeatureContextOptions,
+                selector: '[data-item-uuid][data-type="feature"]',
+                options: {
+                    parentClassHooks: false,
+                    fixed: true
+                }
+            }
         ]
     };
 
@@ -40,7 +48,7 @@ export default class DHBaseItemSheet extends DHApplicationMixin(ItemSheetV2) {
     /** @inheritdoc */
     static TABS = {
         primary: {
-            tabs: [{ id: 'description' }, { id: 'settings' }, { id: 'actions' }],
+            tabs: [{ id: 'description' }, { id: 'settings' }, { id: 'actions' }, { id: 'effects' }],
             initial: 'description',
             labelPrefix: 'DAGGERHEART.GENERAL.Tabs'
         }
@@ -51,8 +59,8 @@ export default class DHBaseItemSheet extends DHApplicationMixin(ItemSheetV2) {
     /* -------------------------------------------- */
 
     /**@inheritdoc */
-    async _preparePartContext(partId, context) {
-        await super._preparePartContext(partId, context);
+    async _preparePartContext(partId, context, options) {
+        await super._preparePartContext(partId, context, options);
         const { TextEditor } = foundry.applications.ux;
 
         switch (partId) {
@@ -64,77 +72,78 @@ export default class DHBaseItemSheet extends DHApplicationMixin(ItemSheetV2) {
                     secrets: this.item.isOwner
                 });
                 break;
+            case "effects":
+                await this._prepareEffectsContext(context, options)
+                break;
+            case "features":
+                context.isGM = game.user.isGM;
+                break;
         }
 
         return context;
     }
 
-    /* -------------------------------------------- */
-    /*  Application Clicks Actions                  */
-    /* -------------------------------------------- */
-
     /**
-     * Render a dialog prompting the user to select an action type.
-     *
-     * @returns {Promise<object>} An object containing the selected action type.
+     * Prepare render context for the Effect part.
+     * @param {ApplicationRenderContext} context
+     * @param {ApplicationRenderOptions} options
+     * @returns {Promise<void>}
+     * @protected
      */
-    static async selectActionType() {
-        const content = await foundry.applications.handlebars.renderTemplate(
-                'systems/daggerheart/templates/actionTypes/actionType.hbs',
-                { types: CONFIG.DH.ACTIONS.actionTypes }
-            ),
-            title = 'Select Action Type';
+    async _prepareEffectsContext(context, _options) {
+        context.effects = {
+            actives: [],
+            inactives: [],
+        };
 
-        return foundry.applications.api.DialogV2.prompt({
-            window: { title },
-            content,
-            ok: {
-                label: title,
-                callback: (event, button, dialog) => button.form.elements.type.value
-            }
-        });
-    }
-
-    /**
-     * Add a new action to the item, prompting the user for its type.
-     * @type {ApplicationClickAction}
-     */
-    static async #addAction(_event, _button) {
-        const actionType = await DHBaseItemSheet.selectActionType();
-        if (!actionType) return;
-        try {
-            const cls =
-                    game.system.api.models.actions.actionsTypes[actionType] ??
-                    game.system.api.models.actions.actionsTypes.attack,
-                action = new cls(
-                    {
-                        _id: foundry.utils.randomID(),
-                        type: actionType,
-                        name: game.i18n.localize(CONFIG.DH.ACTIONS.actionTypes[actionType].name),
-                        ...cls.getSourceConfig(this.document)
-                    },
-                    {
-                        parent: this.document
-                    }
-                );
-            await this.document.update({ 'system.actions': [...this.document.system.actions, action] });
-            await new DHActionConfig(this.document.system.actions[this.document.system.actions.length - 1]).render({
-                force: true
-            });
-        } catch (error) {
-            console.log(error);
+        for (const effect of this.item.effects) {
+            const list = effect.active ? context.effects.actives : context.effects.inactives;
+            list.push(effect);
         }
     }
 
+    /* -------------------------------------------- */
+    /*  Context Menu                                */
+    /* -------------------------------------------- */
+
     /**
-     * Edit an existing action on the item
-     * @type {ApplicationClickAction}
+     * Get the set of ContextMenu options for Features.
+     * @returns {import('@client/applications/ux/context-menu.mjs').ContextMenuEntry[]} - The Array of context options passed to the ContextMenu instance
+     * @this {DHSheetV2}
+     * @protected
      */
-    static async #editAction(_event, button) {
-        const action = this.document.system.actions[button.dataset.index];
-        await new DHActionConfig(action).render({ force: true });
+    static #getFeatureContextOptions() {
+        const options = this._getContextMenuCommonOptions({ usable: true, toChat: true, deletable: false })
+        options.push(
+            {
+                name: 'CONTROLS.CommonDelete',
+                icon: '<i class="fa-solid fa-trash"></i>',
+                callback: async (target) => {
+                    const feature = getDocFromElement(target);
+                    if (!feature) return;
+                    const confirmed = await foundry.applications.api.DialogV2.confirm({
+                        window: {
+                            title: game.i18n.format('DAGGERHEART.APPLICATIONS.DeleteConfirmation.title', {
+                                type: game.i18n.localize(`TYPES.Item.feature`),
+                                name: feature.name
+                            })
+                        },
+                        content: game.i18n.format('DAGGERHEART.APPLICATIONS.DeleteConfirmation.text', { name: feature.name })
+                    });
+                    if (!confirmed) return;
+                    await this.document.update({
+                        'system.features': this.document.system.toObject().features.filter(uuid => uuid !== feature.uuid)
+                    });
+                },
+            }
+        )
+        return options;
     }
 
+    /* -------------------------------------------- */
+    /*  Application Clicks Actions                  */
+    /* -------------------------------------------- */
+
     /**
      * Remove an action from the item.
      * @type {ApplicationClickAction}
@@ -144,16 +153,19 @@ export default class DHBaseItemSheet extends DHApplicationMixin(ItemSheetV2) {
         const actionIndex = button.closest('[data-index]').dataset.index;
         const action = this.document.system.actions[actionIndex];
 
-        const confirmed = await foundry.applications.api.DialogV2.confirm({
-            window: {
-                title: game.i18n.format('DAGGERHEART.APPLICATIONS.DeleteConfirmation.title', {
-                    type: game.i18n.localize(`DAGGERHEART.GENERAL.Action.single`),
-                    name: action.name
-                })
-            },
-            content: game.i18n.format('DAGGERHEART.APPLICATIONS.DeleteConfirmation.text', { name: action.name })
-        });
-        if (!confirmed) return;
+        if(!event.shiftKey) {
+            const confirmed = await foundry.applications.api.DialogV2.confirm({
+                window: {
+                    title: game.i18n.format('DAGGERHEART.APPLICATIONS.DeleteConfirmation.title', {
+                        type: game.i18n.localize(`DAGGERHEART.GENERAL.Action.single`),
+                        name: action.name
+                    })
+                },
+                content: game.i18n.format('DAGGERHEART.APPLICATIONS.DeleteConfirmation.text', { name: action.name })
+            });
+            if (!confirmed) return;
+        }
+
 
         await this.document.update({
             'system.actions': this.document.system.actions.filter((_, index) => index !== Number.parseInt(actionIndex))
@@ -164,57 +176,31 @@ export default class DHBaseItemSheet extends DHApplicationMixin(ItemSheetV2) {
      * Add a new feature to the item, prompting the user for its type.
      * @type {ApplicationClickAction}
      */
-    static async #addFeature(_event, _button) {
-        const feature = await game.items.documentClass.create({
+    static async #addFeature(_, target) {
+        const { type } = target.dataset;
+        const cls = foundry.documents.Item.implementation;
+        const feature = await cls.create({
             type: 'feature',
-            name: game.i18n.format('DOCUMENT.New', { type: game.i18n.localize('TYPES.Item.feature') })
+            name: cls.defaultName({ type: 'feature' }),
+            "system.subType": CONFIG.DH.ITEM.featureSubTypes[type]
         });
         await this.document.update({
-            'system.features': [...this.document.system.features.filter(x => x).map(x => x.uuid), feature.uuid]
+            'system.features': [...this.document.system.features, feature].map(f => f.uuid)
         });
     }
 
-    /**
-     * Edit an existing feature on the item
-     * @type {ApplicationClickAction}
-     */
-    static async #editFeature(_event, button) {
-        const target = button.closest('.feature-item');
-        const feature = this.document.system.features.find(x => x?.id === target.id);
-        if (!feature) {
-            ui.notifications.warn(game.i18n.localize('DAGGERHEART.UI.Notifications.featureIsMissing'));
-            return;
-        }
-
-        feature.sheet.render(true);
-    }
-
     /**
      * Remove a feature from the item.
      * @type {ApplicationClickAction}
      */
-    static async #removeFeature(event, button) {
-        event.stopPropagation();
-        const target = button.closest('.feature-item');
-        const feature = this.document.system.features.find(x => x && x.id === target.id);
-
-        if (feature) {
-            const confirmed = await foundry.applications.api.DialogV2.confirm({
-                window: {
-                    title: game.i18n.format('DAGGERHEART.APPLICATIONS.DeleteConfirmation.title', {
-                        type: game.i18n.localize(`TYPES.Item.feature`),
-                        name: feature.name
-                    })
-                },
-                content: game.i18n.format('DAGGERHEART.APPLICATIONS.DeleteConfirmation.text', { name: feature.name })
-            });
-            if (!confirmed) return;
-        }
-
+    static async #deleteFeature(_, target) {
+        const feature = getDocFromElement(target);
+        if (!feature) return ui.notifications.warn(game.i18n.localize('DAGGERHEART.UI.Notifications.featureIsMissing'));
+        await feature.update({ 'system.subType': null });
         await this.document.update({
             'system.features': this.document.system.features
-                .filter(feature => feature && feature.id !== target.id)
                 .map(x => x.uuid)
+                .filter(uuid => uuid !== feature.uuid)
         });
     }
 
diff --git a/module/applications/sheets/items/ancestry.mjs b/module/applications/sheets/items/ancestry.mjs
index de55301d..fc0b8a52 100644
--- a/module/applications/sheets/items/ancestry.mjs
+++ b/module/applications/sheets/items/ancestry.mjs
@@ -5,7 +5,6 @@ export default class AncestrySheet extends DHHeritageSheet {
     static DEFAULT_OPTIONS = {
         classes: ['ancestry'],
         actions: {
-            addFeature: AncestrySheet.#addFeature,
             editFeature: AncestrySheet.#editFeature,
             removeFeature: AncestrySheet.#removeFeature
         },
@@ -23,23 +22,6 @@ export default class AncestrySheet extends DHHeritageSheet {
     /*  Application Clicks Actions                  */
     /* -------------------------------------------- */
 
-    /**
-     * Add a new feature to the item, prompting the user for its type.
-     * @type {ApplicationClickAction}
-     */
-    static async #addFeature(_event, button) {
-        const feature = await game.items.documentClass.create({
-            type: 'feature',
-            name: game.i18n.format('DOCUMENT.New', { type: game.i18n.localize('TYPES.Item.feature') }),
-            system: {
-                subType: button.dataset.type
-            }
-        });
-        await this.document.update({
-            'system.features': [...this.document.system.features.map(x => x.uuid), feature.uuid]
-        });
-    }
-
     /**
      * Edit an existing feature on the item
      * @type {ApplicationClickAction}
diff --git a/module/applications/sheets/items/armor.mjs b/module/applications/sheets/items/armor.mjs
index f3a38068..80bbe139 100644
--- a/module/applications/sheets/items/armor.mjs
+++ b/module/applications/sheets/items/armor.mjs
@@ -27,7 +27,11 @@ export default class ArmorSheet extends ItemAttachmentSheet(DHBaseItemSheet) {
             template: 'systems/daggerheart/templates/sheets/items/armor/settings.hbs',
             scrollable: ['.settings']
         },
-        ...super.PARTS
+        effects: {
+            template: 'systems/daggerheart/templates/sheets/global/tabs/tab-effects.hbs',
+            scrollable: ['.effects']
+        },
+        ...super.PARTS,
     };
 
     /**@inheritdoc */
diff --git a/module/applications/sheets/items/beastform.mjs b/module/applications/sheets/items/beastform.mjs
index 194f3ab1..db769e94 100644
--- a/module/applications/sheets/items/beastform.mjs
+++ b/module/applications/sheets/items/beastform.mjs
@@ -28,20 +28,4 @@ export default class BeastformSheet extends DHBaseItemSheet {
             labelPrefix: 'DAGGERHEART.GENERAL.Tabs'
         }
     };
-
-    /**@inheritdoc */
-    async _prepareContext(_options) {
-        const context = await super._prepareContext(_options);
-
-        context.document = context.document.toObject();
-        context.document.effects = this.document.effects.map(effect => {
-            const data = effect.toObject();
-            data.id = effect.id;
-            if (effect.type === 'beastform') data.mandatory = true;
-
-            return data;
-        });
-
-        return context;
-    }
 }
diff --git a/module/applications/sheets/items/class.mjs b/module/applications/sheets/items/class.mjs
index 3a34bcec..11feb1b2 100644
--- a/module/applications/sheets/items/class.mjs
+++ b/module/applications/sheets/items/class.mjs
@@ -10,10 +10,6 @@ export default class ClassSheet extends DHBaseItemSheet {
         actions: {
             removeItemFromCollection: ClassSheet.#removeItemFromCollection,
             removeSuggestedItem: ClassSheet.#removeSuggestedItem,
-            viewDoc: ClassSheet.#viewDoc,
-            addFeature: this.addFeature,
-            editFeature: this.editFeature,
-            deleteFeature: this.deleteFeature
         },
         tagifyConfigs: [
             {
@@ -46,13 +42,17 @@ export default class ClassSheet extends DHBaseItemSheet {
         settings: {
             template: 'systems/daggerheart/templates/sheets/items/class/settings.hbs',
             scrollable: ['.settings']
+        },
+        effects: {
+            template: 'systems/daggerheart/templates/sheets/global/tabs/tab-effects.hbs',
+            scrollable: ['.effects']
         }
     };
 
     /** @inheritdoc */
     static TABS = {
         primary: {
-            tabs: [{ id: 'description' }, { id: 'features' }, { id: 'settings' }],
+            tabs: [{ id: 'description' }, { id: 'features' }, { id: 'settings' }, { id: 'effects' }],
             initial: 'description',
             labelPrefix: 'DAGGERHEART.GENERAL.Tabs'
         }
@@ -179,59 +179,4 @@ export default class ClassSheet extends DHBaseItemSheet {
         const { target } = element.dataset;
         await this.document.update({ [`system.characterGuide.${target}`]: null });
     }
-
-    /**
-     * Open the sheet of a item by UUID.
-     * @param {PointerEvent} _event -
-     * @param {HTMLElement} button
-     */
-    static async #viewDoc(_event, button) {
-        const doc = await fromUuid(button.dataset.uuid);
-        doc.sheet.render({ force: true });
-    }
-
-    static async addFeature(_, target) {
-        const feature = await game.items.documentClass.create({
-            type: 'feature',
-            name: game.i18n.format('DOCUMENT.New', { type: game.i18n.localize('TYPES.Item.feature') }),
-            system: {
-                subType:
-                    target.dataset.type === 'hope'
-                        ? CONFIG.DH.ITEM.featureSubTypes.hope
-                        : CONFIG.DH.ITEM.featureSubTypes.class
-            }
-        });
-        await this.document.update({
-            [`system.features`]: [...this.document.system.features.filter(x => x).map(x => x.uuid), feature.uuid]
-        });
-    }
-
-    static async editFeature(_, button) {
-        const target = button.closest('.feature-item');
-        const feature = this.document.system.features.find(x => x?.id === target.dataset.featureId);
-        if (!feature) {
-            ui.notifications.warn(game.i18n.localize('DAGGERHEART.UI.Notifications.featureIsMissing'));
-            return;
-        }
-
-        feature.sheet.render(true);
-    }
-
-    static async deleteFeature(event, button) {
-        event.stopPropagation();
-        const target = button.closest('.feature-item');
-
-        const feature = this.document.system.features.find(
-            feature => feature && feature.id === target.dataset.featureId
-        );
-        if (feature) {
-            await feature.update({ 'system.subType': null });
-        }
-
-        await this.document.update({
-            [`system.features`]: this.document.system.features
-                .filter(feature => feature && feature.id !== target.dataset.featureId)
-                .map(x => x.uuid)
-        });
-    }
 }
diff --git a/module/applications/sheets/items/community.mjs b/module/applications/sheets/items/community.mjs
index 387556d9..3650dec6 100644
--- a/module/applications/sheets/items/community.mjs
+++ b/module/applications/sheets/items/community.mjs
@@ -10,7 +10,7 @@ export default class CommunitySheet extends DHHeritageSheet {
     static PARTS = {
         header: { template: 'systems/daggerheart/templates/sheets/items/community/header.hbs' },
         ...super.PARTS,
-        feature: {
+        features: {
             template: 'systems/daggerheart/templates/sheets/global/tabs/tab-features.hbs',
             scrollable: ['.feature']
         }
diff --git a/module/applications/sheets/items/consumable.mjs b/module/applications/sheets/items/consumable.mjs
index f6fb1ba5..de09744c 100644
--- a/module/applications/sheets/items/consumable.mjs
+++ b/module/applications/sheets/items/consumable.mjs
@@ -19,6 +19,10 @@ export default class ConsumableSheet extends DHBaseItemSheet {
         settings: {
             template: 'systems/daggerheart/templates/sheets/items/consumable/settings.hbs',
             scrollable: ['.settings']
+        },
+        effects: {
+            template: 'systems/daggerheart/templates/sheets/global/tabs/tab-effects.hbs',
+            scrollable: ['.effects']
         }
     };
 }
diff --git a/module/applications/sheets/items/feature.mjs b/module/applications/sheets/items/feature.mjs
index ca375fc7..fcbec97f 100644
--- a/module/applications/sheets/items/feature.mjs
+++ b/module/applications/sheets/items/feature.mjs
@@ -1,5 +1,3 @@
-import { actionsTypes } from '../../../data/action/_module.mjs';
-import DHActionConfig from '../../sheets-configs/action-config.mjs';
 import DHBaseItemSheet from '../api/base-item.mjs';
 
 export default class FeatureSheet extends DHBaseItemSheet {
@@ -7,13 +5,7 @@ export default class FeatureSheet extends DHBaseItemSheet {
     static DEFAULT_OPTIONS = {
         id: 'daggerheart-feature',
         classes: ['feature'],
-        position: { height: 600 },
-        window: { resizable: true },
-        actions: {
-            addAction: FeatureSheet.#addAction,
-            editAction: FeatureSheet.#editAction,
-            removeAction: FeatureSheet.#removeAction
-        }
+        actions: {}
     };
 
     /**@override */
@@ -40,96 +32,4 @@ export default class FeatureSheet extends DHBaseItemSheet {
             labelPrefix: 'DAGGERHEART.GENERAL.Tabs'
         }
     };
-
-    /* -------------------------------------------- */
-
-    /**@inheritdoc */
-    async _prepareContext(_options) {
-        const context = await super._prepareContext(_options);
-
-        return context;
-    }
-
-    /* -------------------------------------------- */
-    /*  Application Clicks Actions                  */
-    /* -------------------------------------------- */
-
-    /**
-     * Render a dialog prompting the user to select an action type.
-     *
-     * @returns {Promise<object>} An object containing the selected action type.
-     */
-    static async selectActionType() {
-        const content = await foundry.applications.handlebars.renderTemplate(
-                'systems/daggerheart/templates/actionTypes/actionType.hbs',
-                {
-                    types: CONFIG.DH.ACTIONS.actionTypes,
-                    itemName: game.i18n.localize('DAGGERHEART.CONFIG.SelectAction.selectType')
-                }
-            ),
-            title = game.i18n.localize('DAGGERHEART.CONFIG.SelectAction.selectType');
-
-        return foundry.applications.api.DialogV2.prompt({
-            window: { title },
-            classes: ['daggerheart', 'dh-style'],
-            content,
-            ok: {
-                label: title,
-                callback: (event, button, dialog) => button.form.elements.type.value
-            }
-        });
-    }
-
-    /**
-     * Add a new action to the item, prompting the user for its type.
-     * @param {PointerEvent} _event - The originating click event
-     * @param {HTMLElement} _button - The capturing HTML element which defines the [data-action="addAction"]
-     */
-    static async #addAction(_event, _button) {
-        const actionType = await FeatureSheet.selectActionType();
-        if (!actionType) return;
-        try {
-            const cls = actionsTypes[actionType] ?? actionsTypes.attack,
-                action = new cls(
-                    {
-                        _id: foundry.utils.randomID(),
-                        type: actionType,
-                        name: game.i18n.localize(CONFIG.DH.ACTIONS.actionTypes[actionType].name),
-                        ...cls.getSourceConfig(this.document)
-                    },
-                    {
-                        parent: this.document
-                    }
-                );
-            await this.document.update({ 'system.actions': [...this.document.system.actions, action] });
-            await new DHActionConfig(this.document.system.actions[this.document.system.actions.length - 1]).render({
-                force: true
-            });
-        } catch (error) {
-            console.log(error);
-        }
-    }
-
-    /**
-     * Edit an existing action on the item
-     * @param {PointerEvent} _event - The originating click event
-     * @param {HTMLElement} button - The capturing HTML element which defines the [data-action="editAction"]
-     */
-    static async #editAction(_event, button) {
-        const action = this.document.system.actions[button.dataset.index];
-        await new DHActionConfig(action).render({ force: true });
-    }
-
-    /**
-     * Remove an action from the item.
-     * @param {PointerEvent} event - The originating click event
-     * @param {HTMLElement} button - The capturing HTML element which defines the [data-action="removeAction"]
-     */
-    static async #removeAction(event, button) {
-        event.stopPropagation();
-        const actionIndex = button.closest('[data-index]').dataset.index;
-        await this.document.update({
-            'system.actions': this.document.system.actions.filter((_, index) => index !== Number.parseInt(actionIndex))
-        });
-    }
 }
diff --git a/module/applications/sheets/items/miscellaneous.mjs b/module/applications/sheets/items/miscellaneous.mjs
index 62df4e8c..0b4b3139 100644
--- a/module/applications/sheets/items/miscellaneous.mjs
+++ b/module/applications/sheets/items/miscellaneous.mjs
@@ -19,6 +19,10 @@ export default class MiscellaneousSheet extends DHBaseItemSheet {
         settings: {
             template: 'systems/daggerheart/templates/sheets/items/miscellaneous/settings.hbs',
             scrollable: ['.settings']
+        },
+        effects: {
+            template: 'systems/daggerheart/templates/sheets/global/tabs/tab-effects.hbs',
+            scrollable: ['.effects']
         }
     };
 }
diff --git a/module/applications/sheets/items/subclass.mjs b/module/applications/sheets/items/subclass.mjs
index fcf62f69..585bd6cb 100644
--- a/module/applications/sheets/items/subclass.mjs
+++ b/module/applications/sheets/items/subclass.mjs
@@ -6,11 +6,7 @@ export default class SubclassSheet extends DHBaseItemSheet {
         classes: ['subclass'],
         position: { width: 600 },
         window: { resizable: false },
-        actions: {
-            addFeature: this.addFeature,
-            editFeature: this.editFeature,
-            deleteFeature: this.deleteFeature
-        }
+        actions: {}
     };
 
     /**@override */
@@ -25,64 +21,22 @@ export default class SubclassSheet extends DHBaseItemSheet {
         settings: {
             template: 'systems/daggerheart/templates/sheets/items/subclass/settings.hbs',
             scrollable: ['.settings']
+        },
+        effects: {
+            template: 'systems/daggerheart/templates/sheets/global/tabs/tab-effects.hbs',
+            scrollable: ['.effects']
         }
     };
 
     /** @inheritdoc */
     static TABS = {
         primary: {
-            tabs: [{ id: 'description' }, { id: 'features' }, { id: 'settings' }],
+            tabs: [{ id: 'description' }, { id: 'features' }, { id: 'settings' }, { id: 'effects' }],
             initial: 'description',
             labelPrefix: 'DAGGERHEART.GENERAL.Tabs'
         }
     };
 
-    static async addFeature(_, target) {
-        const feature = await game.items.documentClass.create({
-            type: 'feature',
-            name: game.i18n.format('DOCUMENT.New', { type: game.i18n.localize('TYPES.Item.feature') }),
-            system: {
-                subType:
-                    target.dataset.type === 'foundation'
-                        ? CONFIG.DH.ITEM.featureSubTypes.foundation
-                        : target.dataset.type === 'specialization'
-                          ? CONFIG.DH.ITEM.featureSubTypes.specialization
-                          : CONFIG.DH.ITEM.featureSubTypes.mastery
-            }
-        });
-        await this.document.update({
-            [`system.features`]: [...this.document.system.features.map(x => x.uuid), feature.uuid]
-        });
-    }
-
-    static async editFeature(_, button) {
-        const feature = this.document.system.features.find(x => x.id === button.dataset.feature);
-        if (!feature) {
-            ui.notifications.warn(game.i18n.localize('DAGGERHEART.UI.Notifications.featureIsMissing'));
-            return;
-        }
-
-        if (feature) {
-            await feature.update({ 'system.subType': null });
-        }
-
-        feature.sheet.render(true);
-    }
-
-    static async deleteFeature(event, target) {
-        event.stopPropagation();
-        const feature = this.document.system.features.find(feature => feature.id === target.dataset.feature);
-        if (feature) {
-            await feature.update({ 'system.subType': null });
-        }
-
-        await this.document.update({
-            [`system.features`]: this.document.system.features
-                .filter(feature => feature && feature.id !== target.dataset.feature)
-                .map(x => x.uuid)
-        });
-    }
-
     async _onDragStart(event) {
         const featureItem = event.currentTarget.closest('.drop-section');
 
diff --git a/module/applications/sheets/items/weapon.mjs b/module/applications/sheets/items/weapon.mjs
index c601f926..3fb725d7 100644
--- a/module/applications/sheets/items/weapon.mjs
+++ b/module/applications/sheets/items/weapon.mjs
@@ -27,7 +27,11 @@ export default class WeaponSheet extends ItemAttachmentSheet(DHBaseItemSheet) {
             template: 'systems/daggerheart/templates/sheets/items/weapon/settings.hbs',
             scrollable: ['.settings']
         },
-        ...super.PARTS
+        effects: {
+            template: 'systems/daggerheart/templates/sheets/global/tabs/tab-effects.hbs',
+            scrollable: ['.effects']
+        },
+        ...super.PARTS,
     };
 
     /**@inheritdoc */
diff --git a/module/applications/ux/contextMenu.mjs b/module/applications/ux/contextMenu.mjs
index a913c450..09454848 100644
--- a/module/applications/ux/contextMenu.mjs
+++ b/module/applications/ux/contextMenu.mjs
@@ -100,7 +100,7 @@ export default class DHContextMenu extends foundry.applications.ux.ContextMenu {
         event.preventDefault();
         event.stopPropagation();
         const { clientX, clientY } = event;
-        const selector = '[data-item-id]';
+        const selector = '[data-item-uuid]';
         const target = event.target.closest(selector) ?? event.currentTarget.closest(selector);
         target?.dispatchEvent(
             new PointerEvent('contextmenu', {
diff --git a/module/data/actor/character.mjs b/module/data/actor/character.mjs
index 292eedb7..c484465a 100644
--- a/module/data/actor/character.mjs
+++ b/module/data/actor/character.mjs
@@ -67,7 +67,7 @@ export default class DhCharacter extends BaseDataActor {
             scars: new fields.TypedObjectField(
                 new fields.SchemaField({
                     name: new fields.StringField({}),
-                    description: new fields.HTMLField()
+                    description: new fields.StringField()
                 })
             ),
             biography: new fields.SchemaField({
diff --git a/module/data/actor/companion.mjs b/module/data/actor/companion.mjs
index fc8195d8..b7774284 100644
--- a/module/data/actor/companion.mjs
+++ b/module/data/actor/companion.mjs
@@ -13,6 +13,7 @@ export default class DhCompanion extends BaseDataActor {
         return foundry.utils.mergeObject(super.metadata, {
             label: 'TYPES.Actor.companion',
             type: 'companion',
+            isNPC: false,
             settingSheet: DHCompanionSettings
         });
     }
diff --git a/module/helpers/handlebarsHelper.mjs b/module/helpers/handlebarsHelper.mjs
index 17326dc2..0a57a6a6 100644
--- a/module/helpers/handlebarsHelper.mjs
+++ b/module/helpers/handlebarsHelper.mjs
@@ -8,10 +8,10 @@ export default class RegisterHandlebarsHelpers {
             times: this.times,
             damageFormula: this.damageFormula,
             damageSymbols: this.damageSymbols,
-            rollParsed: this.rollParsed
+            rollParsed: this.rollParsed,
+            hasProperty: foundry.utils.hasProperty,
         });
     }
-
     static add(a, b) {
         const aNum = Number.parseInt(a);
         const bNum = Number.parseInt(b);
diff --git a/module/helpers/utils.mjs b/module/helpers/utils.mjs
index 91671e36..2aacd5c7 100644
--- a/module/helpers/utils.mjs
+++ b/module/helpers/utils.mjs
@@ -300,6 +300,18 @@ export const updateActorTokens = async (actor, update) => {
     }
 };
 
+/**
+ * Retrieves a Foundry document associated with the nearest ancestor element
+ * that has a `data-item-uuid` attribute.
+ * @param {HTMLElement} element - The DOM element to start the search from.
+ * @returns {foundry.abstract.Document|null} The resolved document, or null if not found or invalid.
+ */
+export function getDocFromElement(element) {
+    const target = element.closest('[data-item-uuid]');
+    return foundry.utils.fromUuidSync(target.dataset.itemUuid) ?? null;
+}
+
+
 export const itemAbleRollParse = (value, actor, item) => {
     if (!value) return value;
 
diff --git a/module/systemRegistration/handlebars.mjs b/module/systemRegistration/handlebars.mjs
index 0c455750..ec5f2df1 100644
--- a/module/systemRegistration/handlebars.mjs
+++ b/module/systemRegistration/handlebars.mjs
@@ -1,10 +1,12 @@
 export const preloadHandlebarsTemplates = async function () {
+    foundry.applications.handlebars.loadTemplates({
+        'daggerheart.inventory-items': 'systems/daggerheart/templates/sheets/global/partials/inventory-fieldset-items-V2.hbs',
+        'daggerheart.inventory-item': 'systems/daggerheart/templates/sheets/global/partials/inventory-item-V2.hbs',
+    })
     return foundry.applications.handlebars.loadTemplates([
         'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs',
-        'systems/daggerheart/templates/sheets/global/partials/inventory-item.hbs',
         'systems/daggerheart/templates/sheets/global/partials/action-item.hbs',
         'systems/daggerheart/templates/sheets/global/partials/domain-card-item.hbs',
-        'systems/daggerheart/templates/sheets/global/partials/inventory-fieldset-items.hbs',
         'systems/daggerheart/templates/sheets/global/partials/item-resource.hbs',
         'systems/daggerheart/templates/sheets/global/partials/resource-section.hbs',
         'systems/daggerheart/templates/components/card-preview.hbs',
diff --git a/styles/less/global/inventory-item.less b/styles/less/global/inventory-item.less
index 30fe920c..d758085b 100644
--- a/styles/less/global/inventory-item.less
+++ b/styles/less/global/inventory-item.less
@@ -12,87 +12,155 @@
     }
 }
 
+.appTheme({}, {
+    .inventory-item-header .img-portait .roll-img {
+        filter: invert(1);
+    }
+});
+
 .application.daggerheart.dh-style {
     .inventory-item {
-        display: grid;
-        grid-template-columns: 40px 1fr 60px;
-        gap: 10px;
         width: 100%;
+        list-style-type: none;
 
-        .item-img {
-            height: 40px;
-            width: 40px;
-            border-radius: 3px;
-            border: none;
-            cursor: pointer;
-            object-fit: cover;
-
-            &.actor-img {
-                border-radius: 50%;
-            }
-        }
-
-        .item-label-wrapper {
-            display: grid;
-            grid-template-columns: 1fr 60px;
-        }
-
-        .item-label {
-            font-family: @font-body;
-            align-self: center;
-
-            &.fullWidth {
-                grid-column: span 2;
-            }
-
-            .item-name {
-                font-size: 14px;
-            }
-
-            .item-tags,
-            .item-labels {
-                display: flex;
-                gap: 10px;
-
-                .tag {
-                    display: flex;
-                    flex-direction: row;
-                    justify-content: center;
-                    align-items: center;
-                    padding: 3px 5px;
-                    font-size: 12px;
-
-                    background: light-dark(@dark-15, @beige-15);
-                    border: 1px solid light-dark(@dark, @beige);
-                    border-radius: 3px;
+        &:hover {
+            .inventory-item-header .img-portait {
+                .roll-img {
+                    opacity: 1;
                 }
-
-                .label {
-                    display: flex;
-                    flex-direction: row;
-                    justify-content: center;
-                    align-items: center;
-                    font-size: 12px;
-                    gap: 4px;
+                .item-img {
+                    opacity: 0;
                 }
             }
         }
 
-        .controls {
+        .inventory-item-header {
             display: flex;
             align-items: center;
-            justify-content: end;
-            gap: 8px;
+            gap: 10px;
+            cursor: pointer;
 
-            a {
-                text-align: center;
+            .img-portait {
+                flex: 0 0 40px;
+                height: 40px;
+                cursor: pointer;
+                position: relative;
 
-                &.unequipped {
-                    opacity: 0.4;
+                .item-img,
+                .roll-img {
+                    position: absolute;
+                    transition: opacity 300ms ease-in;
+                }
+
+                .roll-img {
+                    opacity: 0;
+                }
+            }
+
+            .item-label {
+                flex: 1;
+                font-family: @font-body;
+                align-self: center;
+
+                .item-name {
+                    font-size: 14px;
+                }
+
+                .item-tags,
+                .item-labels {
+                    display: flex;
+                    gap: 10px;
+
+                    .tag,
+                    .label {
+                        display: flex;
+                        flex-direction: row;
+                        justify-content: center;
+                        align-items: center;
+                        font-size: 12px;
+                    }
+
+                    .tag {
+                        padding: 3px 5px;
+                        background: light-dark(@dark-15, @beige-15);
+                        border: 1px solid light-dark(@dark, @beige);
+                        border-radius: 3px;
+                    }
+
+                    .label {
+                        gap: 4px;
+                    }
+                }
+            }
+
+            .item-resource {
+                flex: 0 0 60px;
+                display: flex;
+                align-items: center;
+                gap: 4px;
+            }
+            .controls {
+                flex: 0 0 auto;
+                display: flex;
+                align-items: center;
+                justify-content: end;
+                gap: 8px;
+            }
+        }
+
+        .inventory-item-content {
+            > *:not(:last-child) {
+                margin-bottom: 5px;
+            }
+            &.extensible {
+                max-height: 0;
+                overflow: hidden;
+                transition: max-height 0.5s ease-in-out;
+                &.extended {
+                    max-height: 500px;
+                    overflow: auto;
+                }
+            }
+            .item-resources {
+                display: flex;
+                align-items: center;
+                gap: 4px;
+                .item-dice-resource {
+                    position: relative;
+                    display: flex;
+                    align-items: center;
+                    justify-content: center;
+                    width: 26px;
+
+                    label,
+                    i {
+                        position: absolute;
+                        z-index: 2;
+                        cursor: pointer;
+                    }
+
+                    label {
+                        color: light-dark(white, black);
+                        filter: drop-shadow(0 0 1px light-dark(@dark-blue, @golden));
+                        font-size: 18px;
+                    }
+
+                    img {
+                        filter: brightness(0) saturate(100%) invert(97%) sepia(7%) saturate(580%) hue-rotate(332deg)
+                            brightness(96%) contrast(95%);
+                    }
+
+                    i {
+                        text-shadow: 0 0 3px white;
+                        filter: drop-shadow(0 1px white);
+                        color: black;
+                        font-size: 26px;
+                    }
                 }
             }
         }
     }
+
     .card-item {
         position: relative;
         height: 120px;
@@ -212,6 +280,7 @@
 
             input {
                 flex: 1;
+                text-align: center;
             }
 
             .item-dice-resource {
diff --git a/system.json b/system.json
index 39b1c37f..bfa25df3 100644
--- a/system.json
+++ b/system.json
@@ -35,6 +35,12 @@
         },
         {
             "name": "Po0lp"
+        },
+        {
+            "name": "JoaquinP",
+            "url": "https://github.com/joaquinpereyra98",
+            "email": "joaquinpereyra98@gmail.com",
+            "discord": "joaquinp98"
         }
     ],
     "esmodules": ["build/daggerheart.js"],
@@ -178,14 +184,14 @@
     "documentTypes": {
         "Actor": {
             "character": {
-                "htmlFields": ["story", "description", "scars.*.description"]
+                "htmlFields": ["biography.background", "biography.connections"]
             },
             "companion": {},
             "adversary": {
-                "htmlFields": ["description", "motivesAndTactics"]
+                "htmlFields": ["notes", "description"]
             },
             "environment": {
-                "htmlFields": ["description", "impulses"]
+                "htmlFields": ["notes", "description"]
             }
         },
         "Item": {
diff --git a/templates/sheets-settings/adversary-settings/features.hbs b/templates/sheets-settings/adversary-settings/features.hbs
index f232dae9..a287c2a8 100644
--- a/templates/sheets-settings/adversary-settings/features.hbs
+++ b/templates/sheets-settings/adversary-settings/features.hbs
@@ -16,8 +16,8 @@
                         <span>{{feature.name}}</span>
                     </div>
                     <div class="controls">
-                        <a data-action="editDoc" data-type="Item" data-doc-id="{{feature.id}}" data-tooltip="{{localize 'DAGGERHEART.Tooltip.edit'}}"><i class="fa-solid fa-pen-to-square"></i></a>
-                        <a data-action="deleteDoc"  data-type="Item" data-doc-id="{{feature.id}}" data-tooltip="{{localize 'CONTROLS.CommonDelete'}}"><i class="fa-solid fa-trash"></i></a>
+                        <a data-action="editDoc" data-item-uuid="{{feature.uuid}}" data-tooltip="{{localize 'DAGGERHEART.CommonEdit'}}"><i class="fa-solid fa-pen-to-square"></i></a>
+                        <a data-action="deleteDoc"  data-item-uuid="{{feature.uuid}}" data-tooltip="{{localize 'CONTROLS.CommonDelete'}}"><i class="fa-solid fa-trash"></i></a>
                     </div>
                 </li>
             {{/each}}
diff --git a/templates/sheets-settings/environment-settings/adversaries.hbs b/templates/sheets-settings/environment-settings/adversaries.hbs
index 4d8fa066..4a9ef08d 100644
--- a/templates/sheets-settings/environment-settings/adversaries.hbs
+++ b/templates/sheets-settings/environment-settings/adversaries.hbs
@@ -1,30 +1,33 @@
-<section
-    class='tab {{tabs.adversaries.cssClass}} {{tabs.adversaries.id}}'
-    data-tab='{{tabs.adversaries.id}}'
-    data-group='{{tabs.adversaries.group}}'
->    
+<section class='tab {{tabs.adversaries.cssClass}} {{tabs.adversaries.id}}' data-tab='{{tabs.adversaries.id}}'
+    data-group='{{tabs.adversaries.group}}'>
     <button type="button" class="add-action-btn" data-action="addCategory">
         New Category
     </button>
-    {{#each document.system.potentialAdversaries as |category id|}}
-        <fieldset class="category-container" data-potential-adversary="{{id}}">
-            <legend>{{category.label}}</legend>
-            <div class="category-name">
-                <input type="text" name="{{concat "system.potentialAdversaries." @key ".label" }}" value="{{category.label}}" />
-                <a data-action="removeCategory" data-category-id={{id}} data-tooltip='{{localize "CONTROLS.CommonDelete"}}'>
-                    <i class="fa-solid fa-trash"></i>
-                </a>
+    {{#each document.system.potentialAdversaries as |category categoryId|}}
+    <fieldset class="category-container" data-potential-adversary="{{categoryId}}">
+        <legend>{{category.label}}</legend>
+        <div class="category-name">
+            <input type="text" name="system.potentialAdversaries.{{categoryId}}.label"
+                value="{{category.label}}" />
+            <a data-action="removeCategory" data-category-id={{categoryId}} data-tooltip='{{localize "CONTROLS.CommonDelete"}}'>
+                <i class="fa-solid fa-trash"></i>
+            </a>
+        </div>
+        <div class="adversaries-container">
+            {{#each category.adversaries as |adversary|}}
+            <div class="adversary-container">
+                {{> 'daggerheart.inventory-item'
+                item=adversary
+                type='adversary'
+                isActor=true
+                categoryAdversary=categoryId
+                }}
             </div>
-            <div class="adversaries-container">
-                {{#each category.adversaries as |adversary|}}
-                    <div class="adversary-container">
-                        {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-item.hbs' item=adversary type='adversary' isActor=true categoryAdversary=@../key}}
-                    </div>
-                {{/each}}
-            </div>
-            <div class="adversaries-dragger">
-                Drop Actors here
-            </div>
-        </fieldset>
+            {{/each}}
+        </div>
+        <div class="adversaries-dragger">
+            Drop Actors here
+        </div>
+    </fieldset>
     {{/each}}
 </section>
\ No newline at end of file
diff --git a/templates/sheets-settings/environment-settings/features.hbs b/templates/sheets-settings/environment-settings/features.hbs
index f232dae9..aab68309 100644
--- a/templates/sheets-settings/environment-settings/features.hbs
+++ b/templates/sheets-settings/environment-settings/features.hbs
@@ -16,8 +16,8 @@
                         <span>{{feature.name}}</span>
                     </div>
                     <div class="controls">
-                        <a data-action="editDoc" data-type="Item" data-doc-id="{{feature.id}}" data-tooltip="{{localize 'DAGGERHEART.Tooltip.edit'}}"><i class="fa-solid fa-pen-to-square"></i></a>
-                        <a data-action="deleteDoc"  data-type="Item" data-doc-id="{{feature.id}}" data-tooltip="{{localize 'CONTROLS.CommonDelete'}}"><i class="fa-solid fa-trash"></i></a>
+                        <a data-action="editDoc" data-doc-uuid="{{feature.uuid}}" data-tooltip="{{localize 'CONTROLS.CommonEdit'}}"><i class="fa-solid fa-pen-to-square"></i></a>
+                        <a data-action="deleteDoc"  data-item-uuid="{{feature.uuid}}" data-tooltip="{{localize 'CONTROLS.CommonDelete'}}"><i class="fa-solid fa-trash"></i></a>
                     </div>
                 </li>
             {{/each}}
diff --git a/templates/sheets/actors/adversary/effects.hbs b/templates/sheets/actors/adversary/effects.hbs
index 3d378802..325610e6 100644
--- a/templates/sheets/actors/adversary/effects.hbs
+++ b/templates/sheets/actors/adversary/effects.hbs
@@ -1,8 +1,20 @@
-<section
-    class='tab {{tabs.effects.cssClass}} {{tabs.effects.id}}'
-    data-tab='{{tabs.effects.id}}'
-    data-group='{{tabs.effects.group}}'
->
-    {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-fieldset-items.hbs' title=(localize 'DAGGERHEART.GENERAL.activeEffects') type='effect'}}
-    {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-fieldset-items.hbs' title=(localize 'DAGGERHEART.GENERAL.inactiveEffects') type='effect'}}
+<section class='tab {{tabs.effects.cssClass}} {{tabs.effects.id}}' data-tab='{{tabs.effects.id}}'
+    data-group='{{tabs.effects.group}}'>
+    {{> 'daggerheart.inventory-items'
+    title='DAGGERHEART.GENERAL.activeEffects'
+    type='effect'
+    isGlassy=true
+    collection=effects.actives
+    canCreate=true
+    hideResources=true
+    }}
+
+    {{> 'daggerheart.inventory-items'
+    title='DAGGERHEART.GENERAL.inactiveEffects'
+    type='effect'
+    isGlassy=true
+    collection=effects.inactives
+    canCreate=true
+    hideResources=true
+    }}
 </section>
\ No newline at end of file
diff --git a/templates/sheets/actors/adversary/features.hbs b/templates/sheets/actors/adversary/features.hbs
index 1a8d918e..e5a304ef 100644
--- a/templates/sheets/actors/adversary/features.hbs
+++ b/templates/sheets/actors/adversary/features.hbs
@@ -1,9 +1,13 @@
-<section
-    class='tab {{tabs.features.cssClass}} {{tabs.features.id}}'
-    data-tab='{{tabs.features.id}}'
-    data-group='{{tabs.features.group}}'
->    
+<section class='tab {{tabs.features.cssClass}} {{tabs.features.id}}' data-tab='{{tabs.features.id}}'
+    data-group='{{tabs.features.group}}'>
     <div class="feature-section">
-        {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-fieldset-items.hbs' title=(localize tabs.features.label) type='feature' values=document.system.features hideControls=true}}
+        {{> 'daggerheart.inventory-items'
+        title=tabs.features.label
+        type='feature'
+        collection=document.system.features
+        hideControls=true
+        canCreate=true
+        showActions=true
+        }}
     </div>
 </section>
\ No newline at end of file
diff --git a/templates/sheets/actors/adversary/header.hbs b/templates/sheets/actors/adversary/header.hbs
index 28c0d002..fd6389aa 100644
--- a/templates/sheets/actors/adversary/header.hbs
+++ b/templates/sheets/actors/adversary/header.hbs
@@ -27,7 +27,7 @@
     <line-div></line-div>
     <div class="adversary-info">
         <div class="description">
-            <i>{{{source.system.description}}}</i>
+            <i>{{{description}}}</i>
         </div>
         <div class="motives-and-tatics">
             <b>{{localize 'DAGGERHEART.ACTORS.Adversary.FIELDS.motivesAndTactics.label'}}: </b>{{{source.system.motivesAndTactics}}}
diff --git a/templates/sheets/actors/adversary/notes.hbs b/templates/sheets/actors/adversary/notes.hbs
index effa7240..a2378516 100644
--- a/templates/sheets/actors/adversary/notes.hbs
+++ b/templates/sheets/actors/adversary/notes.hbs
@@ -5,6 +5,6 @@
 >
     <fieldset class="fit-height">
         <legend>{{localize tabs.notes.label}}</legend>
-        {{formInput systemFields.notes value=document.system.notes enriched=document.system.notes localize=true toggled=true}}
+        {{formInput notes.field value=notes.value enriched=notes.enriched toggled=true}}
     </fieldset>
 </section>
\ No newline at end of file
diff --git a/templates/sheets/actors/adversary/sidebar.hbs b/templates/sheets/actors/adversary/sidebar.hbs
index 5384504e..8eb4dcb0 100644
--- a/templates/sheets/actors/adversary/sidebar.hbs
+++ b/templates/sheets/actors/adversary/sidebar.hbs
@@ -1,111 +1,118 @@
 <aside class="adversary-sidebar-sheet">
     <div class="portrait {{#if (and source.system.resources.hitPoints.max (gte source.system.resources.hitPoints.value source.system.resources.hitPoints.max))}}death-roll{{/if}}">
         <img src="{{source.img}}" alt="{{source.name}}" data-action='editImage' data-edit="img">
-        <a class="death-roll-btn" data-tooltip="{{localize "DAGGERHEART.UI.Tooltip.makeDeathMove"}}" data-action="makeDeathMove"><i class="fas fa-skull death-save" ></i></a>
+        <a class="death-roll-btn" data-tooltip="{{localize " DAGGERHEART.UI.Tooltip.makeDeathMove"}}"
+            data-action="makeDeathMove"><i class="fas fa-skull death-save"></i></a>
     </div>
-    
+
     <div class="info-section">
         <div class="resources-section">
             <div class="status-bar">
                 <div class='status-value'>
-                    <p><input class="bar-input" name="system.resources.hitPoints.value" value="{{source.system.resources.hitPoints.value}}" type="number"></p>
+                    <p><input class="bar-input" name="system.resources.hitPoints.value"
+                            value="{{source.system.resources.hitPoints.value}}" type="number"></p>
                     <p>/</p>
                     <p class="bar-label">{{source.system.resources.hitPoints.max}}</p>
                 </div>
-                <progress
-                    class='progress-bar'
-                    value='{{source.system.resources.hitPoints.value}}'
-                    max='{{source.system.resources.hitPoints.max}}'
-                ></progress>
+                <progress class='progress-bar' value='{{source.system.resources.hitPoints.value}}'
+                    max='{{source.system.resources.hitPoints.max}}'></progress>
                 <div class="status-label">
-                    <h4>HP</h4>
+                    <h4>{{localize 'DAGGERHEART.GENERAL.attack.hitPoints.short'}}</h4>
                 </div>
-                
+
             </div>
             <div class="status-bar">
                 <div class='status-value'>
-                    <p><input class="bar-input" name="system.resources.stress.value" value="{{source.system.resources.stress.value}}" type="number"></p>
+                    <p><input class="bar-input" name="system.resources.stress.value"
+                            value="{{source.system.resources.stress.value}}" type="number"></p>
                     <p>/</p>
                     <p class="bar-label">{{source.system.resources.stress.max}}</p>
                 </div>
-                <progress
-                    class='progress-bar stress-color'
-                    value='{{source.system.resources.stress.value}}'
-                    max='{{source.system.resources.stress.max}}'
-                ></progress>
+                <progress class='progress-bar stress-color' value='{{source.system.resources.stress.value}}'
+                    max='{{source.system.resources.stress.max}}'></progress>
                 <div class="status-label">
-                    <h4>Stress</h4>
+                    <h4>{{localize 'DAGGERHEART.GENERAL.stress'}}</h4>
                 </div>
             </div>
         </div>
         <div class="status-section">
             <div class="threshold-section">
-            <h4 class="threshold-label">{{localize "DAGGERHEART.GENERAL.DamageThresholds.minor"}}</h4>
-            <h4 class="threshold-value">{{document.system.damageThresholds.major}}</h4>
-            <h4 class="threshold-label">{{localize "DAGGERHEART.GENERAL.DamageThresholds.major"}}</h4>
-            <h4 class="threshold-value">{{document.system.damageThresholds.severe}}</h4>
-            <h4 class="threshold-label">{{localize "DAGGERHEART.GENERAL.DamageThresholds.severe"}}</h4>
-        </div>
+                <h4 class="threshold-label">{{localize "DAGGERHEART.GENERAL.DamageThresholds.minor"}}</h4>
+                <h4 class="threshold-value">{{document.system.damageThresholds.major}}</h4>
+                <h4 class="threshold-label">{{localize "DAGGERHEART.GENERAL.DamageThresholds.major"}}</h4>
+                <h4 class="threshold-value">{{document.system.damageThresholds.severe}}</h4>
+                <h4 class="threshold-label">{{localize "DAGGERHEART.GENERAL.DamageThresholds.severe"}}</h4>
+            </div>
         </div>
         <div class="status-section">
             <div class="status-number">
                 <div class='status-value armor-slots'>
                     {{#if source.system.difficulty}}
-                        <p>{{source.system.difficulty}}</p>
+                    <p>{{source.system.difficulty}}</p>
                     {{else}}
-                        <p>-</p>
+                    <p>-</p>
                     {{/if}}
                 </div>
                 <div class="status-label">
-                    <h4>Difficulty</h4>
+                    <h4>{{localize DAGGERHEART.GENERAL.difficulty}}</h4>
                 </div>
             </div>
             <div class="status-number">
                 <div class='status-value armor-slots'>
                     {{#if source.system.attack.target.amount}}
-                        <p>{{source.system.attack.target.amount}}</p>
+                    <p>{{source.system.attack.target.amount}}</p>
                     {{else}}
-                        <p>-</p>
+                    <p>-</p>
                     {{/if}}
                 </div>
                 <div class="status-label">
-                    <h4>Attack</h4>
+                    <h4>{{localize "DAGGERHEART.GENERAL.attack"}}</h4>
                 </div>
             </div>
         </div>
     </div>
     <div class="attack-section">
         <div class="title">
-            <side-line-div  class="invert"></side-line-div>
-            <h3>Attack</h3>
+            <side-line-div class="invert"></side-line-div>
+            <h3>{{localize "DAGGERHEART.GENERAL.attack"}}</h3>
             <side-line-div></side-line-div>
         </div>
         <ul class="items-sidebar-list">
-            {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-item.hbs' item=source.system.attack type=source.system.attack.systemPath isSidebar=true}}
+            {{> 'daggerheart.inventory-item'
+            item=document.system.attack
+            type='action'
+            hideTags=true
+            hideDescription=true
+            hideTooltip=true
+            hideResources=true
+            noExtensible=true
+            }}
         </ul>
     </div>
     <div class="experience-section">
         <div class="title">
-            <side-line-div  class="invert"></side-line-div>
-            <h3>Experience</h3>
+            <side-line-div class="invert"></side-line-div>
+            <h3>{{localize DAGGERHEART.GENERAL.experience.plural}}</h3>
             <side-line-div></side-line-div>
         </div>
         <div class="experience-list">
             {{#each source.system.experiences as |experience id|}}
-                <div class="experience-row">
-                    <div class="experience-value">
-                        +{{experience.value}}
-                    </div>
-                    <span class="experience-name">{{experience.name}}</span>
-                    <div class="controls">
-                        <a data-action="toChat" data-type="experience" data-uuid="{{id}}"><i class="fa-regular fa-message"></i></a>
-                    </div>
+            <div class="experience-row">
+                <div class="experience-value">
+                    +{{experience.value}}
                 </div>
+                <span class="experience-name">{{experience.name}}</span>
+                <div class="controls">
+                    <a data-action="sendExpToChat" data-id="{{id}}">
+                        <i class="fa-regular fa-message"></i>
+                    </a>
+                </div>
+            </div>
             {{/each}}
         </div>
     </div>
     <line-div></line-div>
     <div class="reaction-section">
-        <button data-action="reactionRoll">Reaction Test</button>
+        <button data-action="reactionRoll">{{localize DAGGERHEART.GENERAL.Roll.reaction}}</button>
     </div>
 </aside>
\ No newline at end of file
diff --git a/templates/sheets/actors/character/biography.hbs b/templates/sheets/actors/character/biography.hbs
index 34313def..6913f279 100644
--- a/templates/sheets/actors/character/biography.hbs
+++ b/templates/sheets/actors/character/biography.hbs
@@ -26,11 +26,11 @@
         </fieldset>
         <fieldset>
             <legend>{{localize 'DAGGERHEART.ACTORS.Character.story.backgroundTitle'}}</legend>
-            {{formInput systemFields.biography.fields.background value=source.system.biography.background enriched=source.system.biography.background localize=true toggled=true}}
+            {{formInput background.field value=background.value enriched=background.enriched toggled=true}}
         </fieldset>
         <fieldset>
             <legend>{{localize 'DAGGERHEART.ACTORS.Character.story.connectionsTitle'}}</legend>
-            {{formInput systemFields.biography.fields.connections value=source.system.biography.connections enriched=source.system.biography.connections localize=true toggled=true}}
+            {{formInput connections.field value=connections.value enriched=connections.enriched toggled=true}}
         </fieldset>
     </div>
 </section>
\ No newline at end of file
diff --git a/templates/sheets/actors/character/effects.hbs b/templates/sheets/actors/character/effects.hbs
index 3d378802..4c4fca27 100644
--- a/templates/sheets/actors/character/effects.hbs
+++ b/templates/sheets/actors/character/effects.hbs
@@ -1,8 +1,21 @@
-<section
-    class='tab {{tabs.effects.cssClass}} {{tabs.effects.id}}'
-    data-tab='{{tabs.effects.id}}'
-    data-group='{{tabs.effects.group}}'
->
-    {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-fieldset-items.hbs' title=(localize 'DAGGERHEART.GENERAL.activeEffects') type='effect'}}
-    {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-fieldset-items.hbs' title=(localize 'DAGGERHEART.GENERAL.inactiveEffects') type='effect'}}
+<section class='tab {{tabs.effects.cssClass}} {{tabs.effects.id}}' data-tab='{{tabs.effects.id}}'
+    data-group='{{tabs.effects.group}}'>
+
+    {{> 'daggerheart.inventory-items'
+    title='DAGGERHEART.GENERAL.activeEffects'
+    type='effect'
+    isGlassy=true
+    collection=effects.actives
+    canCreate=true
+    hideResources=true
+    }}
+
+    {{> 'daggerheart.inventory-items'
+    title='DAGGERHEART.GENERAL.inactiveEffects'
+    type='effect'
+    isGlassy=true
+    collection=effects.inactives
+    canCreate=true
+    hideResources=true
+    }}
 </section>
\ No newline at end of file
diff --git a/templates/sheets/actors/character/features.hbs b/templates/sheets/actors/character/features.hbs
index 7fab5263..acabd37e 100644
--- a/templates/sheets/actors/character/features.hbs
+++ b/templates/sheets/actors/character/features.hbs
@@ -1,13 +1,25 @@
-<section
-    class='tab {{tabs.features.cssClass}} {{tabs.features.id}}'
-    data-tab='{{tabs.features.id}}'
-    data-group='{{tabs.features.group}}'
->
+<section class='tab {{tabs.features.cssClass}} {{tabs.features.id}}' data-tab='{{tabs.features.id}}'
+    data-group='{{tabs.features.group}}'>
     <div class="features-sections">
-        {{#each document.system.sheetLists}}
-            {{#if this.values}}
-                {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-fieldset-items.hbs' title=this.title values=this.values}}
-            {{/if}}
+        {{#each document.system.sheetLists as |category|}}
+        {{#if (eq category.type 'feature' )}}
+        {{> 'daggerheart.inventory-items'
+        title=category.title
+        type='feature'
+        collection=category.values
+        canCreate=true
+        showActions=true
+        }}
+        {{else if category.values}}
+        {{> 'daggerheart.inventory-items'
+        title=category.title
+        type='feature'
+        collection=category.values
+        canCreate=false
+        showActions=true
+        }}
+
+        {{/if}}
         {{/each}}
     </div>
 </section>
\ No newline at end of file
diff --git a/templates/sheets/actors/character/header.hbs b/templates/sheets/actors/character/header.hbs
index 18e791d1..9e930fd6 100644
--- a/templates/sheets/actors/character/header.hbs
+++ b/templates/sheets/actors/character/header.hbs
@@ -29,25 +29,25 @@
     <div class="character-details">
         <div>
             {{#if document.system.class.value}}
-                <span data-action="editDoc" data-type="Item" data-doc-id="{{document.system.class.value.id}}">{{document.system.class.value.name}}</span>
+                <span data-action="editDoc" data-item-uuid="{{document.system.class.value.uuid}}">{{document.system.class.value.name}}</span>
             {{else}}
                 <span data-action="openPack" data-key="daggerheart.classes">{{localize 'TYPES.Item.class'}}</span>
             {{/if}}
             <span class="dot">•</span>
             {{#if document.system.class.subclass}}
-                <span data-action="editDoc" data-type="Item" data-doc-id="{{document.system.class.subclass.id}}">{{document.system.class.subclass.name}}</span>
+                <span data-action="editDoc" data-item-uuid="{{document.system.class.subclass.uuid}}">{{document.system.class.subclass.name}}</span>
             {{else}}
                 <span data-action="openPack" data-key="daggerheart.subclass">{{localize 'TYPES.Item.subclass'}}</span>
             {{/if}}
             <span class="dot">•</span>
             {{#if document.system.community}}
-                <span data-action="editDoc" data-type="Item" data-doc-id="{{document.system.community.id}}">{{document.system.community.name}}</span>
+                <span data-action="editDoc" data-item-uuid="{{document.system.community.uuid}}">{{document.system.community.name}}</span>
             {{else}}
                 <span data-action="openPack" data-key="daggerheart.community">{{localize 'TYPES.Item.community'}}</span>
             {{/if}}
             <span class="dot">•</span>
             {{#if document.system.ancestry}}
-                <span data-action="editDoc" data-type="Item" data-doc-id="{{document.system.ancestry.id}}">{{document.system.ancestry.name}}</span>
+                <span data-action="editDoc" data-item-uuid="{{document.system.ancestry.uuid}}">{{document.system.ancestry.name}}</span>
             {{else}}
                 <span data-action="openPack" data-key="daggerheart.ancestry">{{localize 'TYPES.Item.ancestry'}}</span>
             {{/if}}
@@ -56,13 +56,13 @@
         {{#if document.system.multiclass.value}}
             <div class="multiclass">
                 {{#if document.system.multiclass.value}}
-                    <span data-action="editDoc" data-type="Item" data-doc-id="{{document.system.multiclass.value.id}}">{{document.system.multiclass.value.name}}</span>
+                    <span data-action="editDoc"data-item-uuid="{{document.system.multiclass.value.uuid}}">{{document.system.multiclass.value.name}}</span>
                 {{else}}
                     <span data-action="openPack" data-key="daggerheart.classes">{{localize 'DAGGERHEART.GENERAL.multiclass'}}</span>
                 {{/if}}
                 <span class="dot">•</span>
                 {{#if document.system.multiclass.subclass}}
-                    <span data-action="editDoc" data-type="Item" data-doc-id="{{document.system.multiclass.subclass.id}}">{{document.system.multiclass.subclass.name}}</span>
+                    <span data-action="editDoc" data-item-uuid="{{document.system.multiclass.subclass.uuid}}">{{document.system.multiclass.subclass.name}}</span>
                 {{else}}
                     <span data-action="openPack" data-key="daggerheart.subclass">{{localize 'TYPES.Item.subclass'}}</span>
                 {{/if}}
diff --git a/templates/sheets/actors/character/inventory.hbs b/templates/sheets/actors/character/inventory.hbs
index be8bb251..9610d8e2 100644
--- a/templates/sheets/actors/character/inventory.hbs
+++ b/templates/sheets/actors/character/inventory.hbs
@@ -1,8 +1,5 @@
-<section
-    class='tab {{tabs.inventory.cssClass}} {{tabs.inventory.id}}'
-    data-tab='{{tabs.inventory.id}}'
-    data-group='{{tabs.inventory.group}}'
->
+<section class='tab {{tabs.inventory.cssClass}} {{tabs.inventory.id}}' data-tab='{{tabs.inventory.id}}'
+    data-group='{{tabs.inventory.group}}'>
     <div class="search-section">
         <div class="search-bar">
             <div class="icon">
@@ -14,31 +11,61 @@
             <i class="fa-solid fa-filter"></i>
         </a>
     </div>
-    
+
     <div class="items-section">
-        {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-fieldset-items.hbs' title=(localize 'TYPES.Item.weapon') type='weapon' isGlassy=true}}
-        {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-fieldset-items.hbs' title=(localize 'TYPES.Item.armor') type='armor' isGlassy=true}}
-        {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-fieldset-items.hbs' title=(localize 'TYPES.Item.consumable') type='consumable' isGlassy=true}}
-        {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-fieldset-items.hbs' title=(localize 'TYPES.Item.miscellaneous') type='miscellaneous' isGlassy=true}}
+        {{> 'daggerheart.inventory-items'
+        title='TYPES.Item.weapon'
+        type='weapon'
+        collection=document.itemTypes.weapon
+        isGlassy=true
+        canCreate=true
+        hideResources=true
+        }}
+        {{> 'daggerheart.inventory-items'
+        title='TYPES.Item.armor'
+        type='armor'
+        collection=document.itemTypes.armor
+        isGlassy=true
+        canCreate=true
+        hideResources=true
+        }}
+        {{> 'daggerheart.inventory-items'
+        title='TYPES.Item.consumable'
+        type='consumable'
+        collection=document.itemTypes.consumable
+        isGlassy=true
+        canCreate=true
+        }}
+        {{> 'daggerheart.inventory-items'
+        title='TYPES.Item.miscellaneous'
+        type='miscellaneous'
+        collection=document.itemTypes.miscellaneous
+        isGlassy=true
+        canCreate=true
+        }}
     </div>
 
-    <div class="currency-section">       
+    <div class="currency-section">
         <div class="input">
             <span>{{localize this.inventory.currency.coins}}</span>
-            {{formInput systemFields.gold.fields.coins value=source.system.gold.coins enriched=source.system.gold.coins localize=true toggled=true}}
+            {{formInput systemFields.gold.fields.coins value=source.system.gold.coins enriched=source.system.gold.coins
+            localize=true toggled=true}}
         </div>
         <div class="input">
             <span>{{localize this.inventory.currency.handfulls}}</span>
-            {{formInput systemFields.gold.fields.handfulls value=source.system.gold.handfulls enriched=source.system.gold.handfulls localize=true toggled=true}}
+            {{formInput systemFields.gold.fields.handfulls value=source.system.gold.handfulls
+            enriched=source.system.gold.handfulls localize=true toggled=true}}
         </div>
         <div class="input">
             <span>{{localize this.inventory.currency.bags}}</span>
-            {{formInput systemFields.gold.fields.bags value=source.system.gold.bags enriched=source.system.gold.bags localize=true toggled=true}}
+            {{formInput systemFields.gold.fields.bags value=source.system.gold.bags enriched=source.system.gold.bags
+            localize=true toggled=true}}
         </div>
         <div class="input">
             <span>{{localize this.inventory.currency.chests}}</span>
-            {{formInput systemFields.gold.fields.chests value=source.system.gold.chests enriched=source.system.gold.chests localize=true toggled=true}}
+            {{formInput systemFields.gold.fields.chests value=source.system.gold.chests
+            enriched=source.system.gold.chests localize=true toggled=true}}
         </div>
-        
+
     </div>
 </section>
\ No newline at end of file
diff --git a/templates/sheets/actors/character/loadout.hbs b/templates/sheets/actors/character/loadout.hbs
index 5a1d675e..0319d56f 100644
--- a/templates/sheets/actors/character/loadout.hbs
+++ b/templates/sheets/actors/character/loadout.hbs
@@ -10,28 +10,33 @@
         <a class="filter-button">
             <i class="fa-solid fa-filter"></i>
         </a>
-        <button type="button" class="btn-toggle-view" data-action="toggleLoadoutView" data-value="{{listView}}">
-            <span class="{{ifThen listView 'list-active' ''}} list-icon">
+        <button type="button" class="btn-toggle-view" data-action="toggleLoadoutView" data-value="{{not cardView}}">
+            <span class="{{ifThen cardView '' 'list-active'}} list-icon">
                 <i class="fa-solid fa-bars"></i>
             </span>
-            <span class="{{ifThen listView '' 'grid-active'}} grid-icon">
+            <span class="{{ifThen cardView 'grid-active' ''}} grid-icon">
                 <i class="fa-solid fa-grip"></i>
             </span>
         </button>
     </div>
 
     <div class="items-section">
-        {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-fieldset-items.hbs'
-        title=(localize 'DAGGERHEART.GENERAL.Tabs.loadout')
+        {{> 'daggerheart.inventory-items'
+        title='DAGGERHEART.GENERAL.Tabs.loadout'
         type='domainCard'
         isGlassy=true
-        cardView=(ifThen listView "list" "card")}}
-
-        {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-fieldset-items.hbs'
-        title=(localize 'DAGGERHEART.GENERAL.Tabs.vault')
+        cardView=cardView
+        collection=document.system.domainCards.loadout
+        canCreate=true
+        }}
+        {{> 'daggerheart.inventory-items'
+        title='DAGGERHEART.GENERAL.Tabs.vault'
         type='domainCard'
-        isVault=true
         isGlassy=true
-        cardView=(ifThen listView "list" "card")}}
+        cardView=cardView
+        collection=document.system.domainCards.vault
+        canCreate=true
+        inVault=true
+        }}
     </div>
 </section>
\ No newline at end of file
diff --git a/templates/sheets/actors/character/sidebar.hbs b/templates/sheets/actors/character/sidebar.hbs
index 51816443..553ba246 100644
--- a/templates/sheets/actors/character/sidebar.hbs
+++ b/templates/sheets/actors/character/sidebar.hbs
@@ -1,14 +1,16 @@
 <aside class="character-sidebar-sheet">
     <div class="portrait {{#if isDeath}}death-roll{{/if}}">
         <img src="{{document.img}}" alt="{{document.name}}" data-action='editImage' data-edit="img">
-        <a class="death-roll-btn" data-tooltip="{{localize "DAGGERHEART.UI.Tooltip.makeDeathMove"}}" {{#if isDeath}}data-action="makeDeathMove"{{/if}}><i class="fas fa-skull death-save" ></i></a>
+        <a class="death-roll-btn" data-tooltip="DAGGERHEART.UI.Tooltip.makeDeathMove" {{#if
+            isDeath}}data-action="makeDeathMove" {{/if}}><i class="fas fa-skull death-save"></i></a>
     </div>
-    
+
     <div class="info-section">
         <div class="resources-section">
             <div class="status-bar">
                 <div class='status-value'>
-                    <p><input class="bar-input" name="system.resources.hitPoints.value" value="{{document.system.resources.hitPoints.value}}" type="number"></p>
+                    <p><input class="bar-input" name="system.resources.hitPoints.value"
+                            value="{{document.system.resources.hitPoints.value}}" type="number"></p>
                     <p>/</p>
                     <p class="bar-label">{{document.system.resources.hitPoints.max}}</p>
                 </div>
@@ -20,11 +22,12 @@
                 <div class="status-label">
                     <h4>HP</h4>
                 </div>
-                
+
             </div>
             <div class="status-bar">
                 <div class='status-value'>
-                    <p><input class="bar-input" name="system.resources.stress.value" value="{{document.system.resources.stress.value}}" type="number"></p>
+                    <p><input class="bar-input" name="system.resources.stress.value"
+                            value="{{document.system.resources.stress.value}}" type="number"></p>
                     <p>/</p>
                     <p class="bar-label">{{document.system.resources.stress.max}}</p>
                 </div>
@@ -87,51 +90,65 @@
     </div>
     <div class="equipment-section">
         <div class="title">
-            <side-line-div  class="invert"></side-line-div>
+            <side-line-div class="invert"></side-line-div>
             <h3>Equipment</h3>
             <side-line-div></side-line-div>
         </div>
         <ul class="items-sidebar-list">
             {{#each document.items as |item|}}
-                {{#if item.system.equipped}}
-                    {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-item.hbs' item=item type=item.type isSidebar=true}}
-                {{/if}}
+            {{#if item.system.equipped}}
+            {{> 'daggerheart.inventory-item'
+            item=item
+            type=item.type
+            hideTags=true
+            hideDescription=true
+            hideResources=true
+            noExtensible=true
+            }}
+            {{/if}}
             {{/each}}
         </ul>
     </div>
     <div class="loadout-section">
         <div class="title">
-            <side-line-div  class="invert"></side-line-div>
+            <side-line-div class="invert"></side-line-div>
             <h3>Loadout</h3>
             <side-line-div></side-line-div>
         </div>
         <ul class="items-sidebar-list">
-            {{#each document.items as |item|}}
-                {{#if (eq item.type 'domainCard')}}
-                    {{#unless item.system.inVault}}
-                        {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-item.hbs' item=item type=item.type isSidebar=true}}
-                    {{/unless}}
-                {{/if}}
+            {{#each document.system.domainCards.loadout as |card|}}
+              {{> 'daggerheart.inventory-item'
+                item=card
+                type='domainCard'
+                hideTags=true
+                hideDescription=true
+                hideResources=true
+                noExtensible=true
+            }}
+
             {{/each}}
         </ul>
     </div>
     <div class="experience-section">
         <div class="title">
-            <side-line-div  class="invert"></side-line-div>
+            <side-line-div class="invert"></side-line-div>
             <h3>Experience</h3>
             <side-line-div></side-line-div>
         </div>
         <div class="experience-list">
             {{#each document.system.experiences as |experience id|}}
-                <div class="experience-row">
-                    <div class="experience-value">
-                        +{{experience.value}}
-                    </div>
-                    <input name="{{concat "system.experiences." id ".name"}}" data-experience={{id}} value="{{experience.name}}" type="text" />
-                    <div class="controls">
-                        <a data-action="toChat" data-type="experience" data-uuid="{{id}}"><i class="fa-regular fa-message"></i></a>
-                    </div>
+            <div class="experience-row">
+                <div class="experience-value">
+                    +{{experience.total}}
                 </div>
+                <input name="system.experiences.{{id}}.name" data-experience={{id}}
+                    value="{{experience.name}}" type="text" />
+                <div class="controls">
+                    <a data-action="sendExpToChat" data-type="experience" data-id="{{id}}">
+                        <i class="fa-regular fa-message"></i>
+                    </a>
+                </div>
+            </div>
             {{/each}}
         </div>
     </div>
diff --git a/templates/sheets/actors/companion/details.hbs b/templates/sheets/actors/companion/details.hbs
index 0f5587f3..719ffdf4 100644
--- a/templates/sheets/actors/companion/details.hbs
+++ b/templates/sheets/actors/companion/details.hbs
@@ -1,8 +1,5 @@
-<section
-    class='tab {{tabs.details.cssClass}} {{tabs.details.id}}'
-    data-tab='{{tabs.details.id}}'
-    data-group='{{tabs.details.group}}'
->
+<section class='tab {{tabs.details.cssClass}} {{tabs.details.id}}' data-tab='{{tabs.details.id}}'
+    data-group='{{tabs.details.group}}'>
     <div class="partner-section">
         <div class="title">
             <side-line-div  class="invert"></side-line-div>
@@ -10,11 +7,18 @@
             <side-line-div></side-line-div>
         </div>
         {{#if document.system.partner}}
-            <ul class="item-list">
-                {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-item.hbs' item=document.system.partner type='actor' isSidebar=true isActor=true noTooltip=true}}
-            </ul>
+        <ul class="item-list">
+            {{> 'daggerheart.inventory-item'
+            item=document.system.partner
+            type='companion'
+            hideTags=true
+            hideDescription=true
+            isActor=true
+            hideTooltip=true
+            }}
+        </ul>
         {{else}}
-            <span class="partner-placeholder">{{localize "DAGGERHEART.ACTORS.Companion.noPartner"}}</span>
+        <span class="partner-placeholder">{{localize "DAGGERHEART.ACTORS.Companion.noPartner"}}</span>
         {{/if}}
     </div>
     <div class="attack-section">
@@ -24,7 +28,13 @@
             <side-line-div></side-line-div>
         </div>
         <ul class="item-list">
-            {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-item.hbs' item=source.system.attack type=source.system.attack.systemPath isSidebar=true isCompanion=true noTooltip=true}}
+            {{> 'daggerheart.inventory-item'
+            item=document.system.attack
+            type='action'
+            hideTags=true
+            hideDescription=true
+            hideTooltip=true
+            }}
         </ul>
     </div>
     <div class="experience-list">
@@ -34,15 +44,16 @@
             <side-line-div></side-line-div>
         </div>
         {{#each source.system.experiences as |experience id|}}
-            <div class="experience-row">
-                <div class="experience-value">
-                    +{{experience.value}}
-                </div>
-                <span class="experience-name">{{experience.name}}</span>
-                <div class="controls">
-                    <a data-action="toChat" data-type="experience" data-uuid="{{id}}"><i class="fa-regular fa-message"></i></a>
-                </div>
+        <div class="experience-row">
+            <div class="experience-value">
+                +{{experience.value}}
             </div>
+            <span class="experience-name">{{experience.name}}</span>
+            <div class="controls">
+                <a data-action="sendExpToChat" data-type="experience" data-id="{{id}}">
+                    <i class="fa-regular fa-message"></i></a>
+            </div>
+        </div>
         {{/each}}
     </div>
 </section>
\ No newline at end of file
diff --git a/templates/sheets/actors/companion/effects.hbs b/templates/sheets/actors/companion/effects.hbs
index 3d378802..325610e6 100644
--- a/templates/sheets/actors/companion/effects.hbs
+++ b/templates/sheets/actors/companion/effects.hbs
@@ -1,8 +1,20 @@
-<section
-    class='tab {{tabs.effects.cssClass}} {{tabs.effects.id}}'
-    data-tab='{{tabs.effects.id}}'
-    data-group='{{tabs.effects.group}}'
->
-    {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-fieldset-items.hbs' title=(localize 'DAGGERHEART.GENERAL.activeEffects') type='effect'}}
-    {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-fieldset-items.hbs' title=(localize 'DAGGERHEART.GENERAL.inactiveEffects') type='effect'}}
+<section class='tab {{tabs.effects.cssClass}} {{tabs.effects.id}}' data-tab='{{tabs.effects.id}}'
+    data-group='{{tabs.effects.group}}'>
+    {{> 'daggerheart.inventory-items'
+    title='DAGGERHEART.GENERAL.activeEffects'
+    type='effect'
+    isGlassy=true
+    collection=effects.actives
+    canCreate=true
+    hideResources=true
+    }}
+
+    {{> 'daggerheart.inventory-items'
+    title='DAGGERHEART.GENERAL.inactiveEffects'
+    type='effect'
+    isGlassy=true
+    collection=effects.inactives
+    canCreate=true
+    hideResources=true
+    }}
 </section>
\ No newline at end of file
diff --git a/templates/sheets/actors/environment/features.hbs b/templates/sheets/actors/environment/features.hbs
index 6697e42c..d7f10d56 100644
--- a/templates/sheets/actors/environment/features.hbs
+++ b/templates/sheets/actors/environment/features.hbs
@@ -4,6 +4,13 @@
     data-group='{{tabs.features.group}}'
 >
     <div class="feature-section">
-        {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-fieldset-items.hbs' title=(localize tabs.features.label) type='feature' values=document.system.features hideControls=true }}
+        {{> 'daggerheart.inventory-items'
+        title=tabs.features.label
+        type='feature'
+        collection=document.system.features
+        hideControls=true
+        canCreate=true
+        showActions=true
+        }}
     </div>
 </section>
\ No newline at end of file
diff --git a/templates/sheets/actors/environment/header.hbs b/templates/sheets/actors/environment/header.hbs
index e9921bae..fff55144 100644
--- a/templates/sheets/actors/environment/header.hbs
+++ b/templates/sheets/actors/environment/header.hbs
@@ -34,7 +34,7 @@
     <line-div></line-div>
     <div class="environment-info">
         <div class="description">
-            <i>{{{source.system.description}}}</i>
+            <i>{{{description}}}</i>
         </div>
         <div class="impulses">
             <b>{{localize 'DAGGERHEART.ACTORS.Environment.FIELDS.impulses.label'}}: </b>{{{source.system.impulses}}}
diff --git a/templates/sheets/actors/environment/notes.hbs b/templates/sheets/actors/environment/notes.hbs
index effa7240..663a484a 100644
--- a/templates/sheets/actors/environment/notes.hbs
+++ b/templates/sheets/actors/environment/notes.hbs
@@ -5,6 +5,6 @@
 >
     <fieldset class="fit-height">
         <legend>{{localize tabs.notes.label}}</legend>
-        {{formInput systemFields.notes value=document.system.notes enriched=document.system.notes localize=true toggled=true}}
+        {{formInput notes.field value=notes.value enriched=notes.value toggled=true}}
     </fieldset>
 </section>
\ No newline at end of file
diff --git a/templates/sheets/actors/environment/potentialAdversaries.hbs b/templates/sheets/actors/environment/potentialAdversaries.hbs
index f39a1adf..cc246312 100644
--- a/templates/sheets/actors/environment/potentialAdversaries.hbs
+++ b/templates/sheets/actors/environment/potentialAdversaries.hbs
@@ -4,8 +4,17 @@
     data-group='{{tabs.potentialAdversaries.group}}'
 >    
     <div class="action-section">
-        {{#each document.system.potentialAdversaries}}
-            {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-fieldset-items.hbs' title=this.label type='adversary' isGlassy=true adversaries=this.adversaries}}
+        {{#each document.system.potentialAdversaries as |category categoryId|}}
+            {{> 'daggerheart.inventory-items'
+            title=category.label
+            type='adversary'
+            isGlassy=true
+            isActor=true
+            categoryAdversary=categoryId
+            hideControls=true
+            collection=category.adversaries
+            hideResources=true
+            }}
         {{/each}}
     </div>
 </section>
\ No newline at end of file
diff --git a/templates/sheets/global/partials/domain-card-item.hbs b/templates/sheets/global/partials/domain-card-item.hbs
index 0ff7e8f5..37d6a0e2 100644
--- a/templates/sheets/global/partials/domain-card-item.hbs
+++ b/templates/sheets/global/partials/domain-card-item.hbs
@@ -1,34 +1,22 @@
-<li class="card-item" data-item-id="{{item.id}}" data-item-id="{{item.id}}">
+<li class="card-item" data-item-uuid="{{item.uuid}}">
     <img src="{{item.img}}" data-action="useItem" class="card-img" />
     <div class="card-label">
-        <div class="menu {{#if item.system.resource}}resource-menu{{/if}} {{#if (eq item.system.resource.type 'diceValue')}}dice-menu{{/if}}">
+        <div
+            class="menu {{#if item.system.resource}}resource-menu{{/if}} {{#if (eq item.system.resource.type 'diceValue')}}dice-menu{{/if}}">
             {{#if item.system.resource}}
-                {{> "systems/daggerheart/templates/sheets/global/partials/item-resource.hbs"}}
+            {{> "systems/daggerheart/templates/sheets/global/partials/item-resource.hbs"}}
             {{/if}}
             <div class="controls">
-                {{#if (eq type 'weapon')}}
-                    <a class="{{#unless item.system.equipped}}unequipped{{/unless}}" data-action="toggleEquipItem" data-tooltip="{{#unless item.system.equipped}}{{localize 'DAGGERHEART.UI.Tooltip.equip'}}{{else}}{{localize 'DAGGERHEART.UI.Tooltip.unequip'}}{{/unless}}">
-                        <i class="fa-solid fa-hands"></i>
-                    </a>
-                {{/if}}
-                {{#if (eq type 'armor')}}
-                    <a class="{{#unless item.system.equipped}}unequipped{{/unless}}" data-action="toggleEquipItem" data-tooltip="{{#unless item.system.equipped}}{{localize 'DAGGERHEART.UI.Tooltip.equip'}}{{else}}{{localize 'DAGGERHEART.UI.Tooltip.unequip'}}{{/unless}}">
-                    <i class="fa-solid fa-shield"></i>
-                    </a>
-                {{/if}}
-                {{#if (eq type 'domainCard')}}
-                    {{#unless item.system.inVault}}
-                        <a data-action="toggleVault" data-tooltip="{{localize 'DAGGERHEART.UI.Tooltip.sendToVault'}}">
-                            <i class="fa-solid fa-arrow-down"></i>
-                        </a>
-                    {{else}}
-                        <a data-action="toggleVault" data-tooltip="{{localize 'DAGGERHEART.UI.Tooltip.sendToLoadout'}}">
-                            <i class="fa-solid fa-arrow-up"></i>
-                        </a>
-                    {{/unless}}
-                {{/if}}
-                <a data-action="toChat" data-tooltip="{{localize 'DAGGERHEART.UI.Tooltip.sendToChat'}}"><i class="fa-regular fa-message"></i></a>
-                <a data-action="triggerContextMenu" data-tooltip="{{localize 'DAGGERHEART.UI.Tooltip.moreOptions'}}"><i class="fa-solid fa-ellipsis-vertical"></i></a>
+                <a data-action="toggleVault"
+                    data-tooltip="DAGGERHEART.UI.Tooltip.{{ifThen item.system.inVault 'sendToLoadout' 'sendToVault' }}">
+                    <i class="fa-solid {{ifThen item.system.inVault 'fa-arrow-up' 'fa-arrow-down'}}"></i>
+                </a>
+                <a data-action="toChat" data-tooltip="DAGGERHEART.UI.Tooltip.sendToChat">
+                    <i class="fa-regular fa-message"></i>
+                </a>
+                <a data-action="triggerContextMenu" data-tooltip="DAGGERHEART.UI.Tooltip.moreOptions">
+                    <i class="fa-solid fa-ellipsis-vertical"></i>
+                </a>
             </div>
         </div>
         <div class="card-name">{{item.name}}</div>
diff --git a/templates/sheets/global/partials/feature-section-item.hbs b/templates/sheets/global/partials/feature-section-item.hbs
index a1eb6432..238031c5 100644
--- a/templates/sheets/global/partials/feature-section-item.hbs
+++ b/templates/sheets/global/partials/feature-section-item.hbs
@@ -1,30 +1,18 @@
-<li class='feature-item' data-feature-id='{{feature.id}}'>
+<li class='feature-item' data-item-uuid='{{feature.uuid}}'>
     <div class='feature-line'>
         <img class='image' src='{{feature.img}}' />
         <h4>
             {{feature.name}}
         </h4>
         {{#unless hideContrals}}
-            <div class='controls'>
-                <a
-                    class='effect-control'
-                    data-action='editFeature'
-                    data-feature='{{feature._id}}'
-                    data-type='{{type}}'
-                    data-tooltip='{{localize "DAGGERHEART.UI.Tooltip.openItemWorld"}}'
-                >
-                    <i class="fa-solid fa-globe"></i>
-                </a>
-                <a
-                    class='effect-control'
-                    data-action='deleteFeature'
-                    data-feature='{{feature._id}}'
-                    data-type='{{type}}'
-                    data-tooltip='{{localize "CONTROLS.CommonDelete"}}'
-                >
-                    <i class='fas fa-trash'></i>
-                </a>
-            </div>
+        <div class='controls'>
+            <a class='effect-control' data-action='editDoc' data-tooltip="DAGGERHEART.UI.Tooltip.openItemWorld">
+                <i class="fa-solid fa-globe"></i>
+            </a>
+            <a class='effect-control' data-action='deleteFeature' data-tooltip="CONTROLS.CommonDelete">
+                <i class='fas fa-trash'></i>
+            </a>
+        </div>
         {{/unless}}
     </div>
 </li>
\ No newline at end of file
diff --git a/templates/sheets/global/partials/inventory-fieldset-items-V2.hbs b/templates/sheets/global/partials/inventory-fieldset-items-V2.hbs
new file mode 100644
index 00000000..aa58aad8
--- /dev/null
+++ b/templates/sheets/global/partials/inventory-fieldset-items-V2.hbs
@@ -0,0 +1,70 @@
+{{!--
+Inventory/Domain Card Section
+
+{{> 'daggerheart.inventory-items' }}
+
+Parameters:
+- title {string} : Localization key used for the legend.
+- collection {array} : Array of items to render.
+- type {string} : The type of items in the list:
+- isGlassy {boolean} : If true, applies the 'glassy' class to the fieldset.
+- cardView {boolean} : If true and type is 'domainCard', renders using domain card layout.
+- isActor {boolean} : Passed through to inventory-item partials.
+- canCreate {boolean} : If true, show createDoc anchor on legend
+- inVault {boolean} : If true, the domainCard is created with inVault=true
+- disabled {boolean}:  If true, the ActiveEffect is created with disabled=true;
+- categoryAdversary {string} : Category adversary id.
+- showLabels {boolean} : If true, show label-tags else show simple tags.
+- hideTooltip {boolean} : If true, disables the tooltip on the item image.
+- hideControls {boolean} : If true, hides the controls inside inventory-item partials.
+- hideDescription {boolean} : If true, hides the item's description.
+- hideResources {boolean} : If true, hides the item's resources.
+- showActions {boolean} : If true show feature's actions. 
+--}}
+
+<fieldset class="{{#if isGlassy}}glassy{{/if}}">
+  <legend>
+    {{localize title}}
+    {{#if canCreate}}
+    <a data-action="createDoc" data-document-class="{{ifThen (eq type 'effect') 'ActiveEffect' 'Item' }}"
+      data-type="{{ifThen (eq type 'effect') 'base' type}}"
+      {{#if inVault}}data-in-vault="{{inVault}}"{{/if}}
+      {{#if disabled}} data-disabled="{{disabled}}"{{/if}}
+      data-tooltip="{{localize 'DOCUMENT.Create' type=''}}"
+      >
+      <i class="fa-solid fa-plus icon-button"></i>
+    </a>
+    {{/if }}
+  </legend>
+  {{#if (and cardView (eq type 'domainCard'))}}
+  <ul class="card-list">
+    {{#each collection as |item|}}
+
+    {{> 'systems/daggerheart/templates/sheets/global/partials/domain-card-item.hbs'
+    item=item
+    type='domainCard'
+    }}
+
+    {{/each}}
+  </ul>
+  {{else}}
+  <ul class="items-list">
+    {{#each collection as |item|}}
+
+    {{> 'daggerheart.inventory-item'
+    item=item
+    type=../type
+    hideControls=../hideControls
+    isActor=../isActor
+    categoryAdversary=../categoryAdversary
+    hideTooltip=../hideTooltip
+    showLabels=../showLabels
+    isAction=../isAction
+    hideResources=../hideResources
+    showActions=../showActions
+    }}
+
+    {{/each}}
+  </ul>
+  {{/if}}
+</fieldset>
\ No newline at end of file
diff --git a/templates/sheets/global/partials/inventory-fieldset-items.hbs b/templates/sheets/global/partials/inventory-fieldset-items.hbs
deleted file mode 100644
index 65c52736..00000000
--- a/templates/sheets/global/partials/inventory-fieldset-items.hbs
+++ /dev/null
@@ -1,44 +0,0 @@
-<fieldset class="{{#if isGlassy}}glassy{{/if}}">
-    <legend>{{title}}</legend>
-    <ul class="items-list">
-        {{#unless (eq cardView 'card') }}
-            {{#if (or (eq type 'domainCard') (eq type 'armor') (eq type 'consumable') (eq type 'miscellaneous') (eq type 'weapon'))}}
-                {{#each document.items as |item|}}
-                    {{#if (eq item.type ../type)}}
-                        {{#unless (and (eq ../type 'domainCard') (or (and item.system.inVault (not ../isVault)) (and (not item.system.inVault) ../isVault)))}}
-                            {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-item.hbs' item=item type=../type}}
-                        {{/unless}}
-                    {{/if}}
-                {{/each}}
-            {{else}}
-                {{#if (eq type 'effect')}}
-                    {{#each document.effects as |effect|}}
-                        {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-item.hbs' item=effect type=../type}}
-                    {{/each}}
-                {{else}}
-                    {{#each values}}
-                        {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-item.hbs' item=this type=../type hideControls=../hideControls featureType=true }}
-                    {{/each}}
-                    
-                    {{#each adversaries as |adversary|}}
-                        {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-item.hbs' item=adversary type='adversary' hideControls=true isActor=true categoryAdversary=@../key}}
-                    {{/each}}
-                {{/if}}
-            {{/if}}
-        {{/unless}}
-        
-    </ul>
-    {{#if (and (eq cardView 'card') (eq type 'domainCard'))}}
-        <ul class="card-list">
-            {{#if isVault}}
-                {{#each document.system.domainCards.vault as |card|}}
-                    {{> 'systems/daggerheart/templates/sheets/global/partials/domain-card-item.hbs' item=card type=../type}}
-                {{/each}}
-            {{else}}
-                {{#each document.system.domainCards.loadout as |card|}}
-                    {{> 'systems/daggerheart/templates/sheets/global/partials/domain-card-item.hbs' item=card type=../type}}
-                {{/each}}
-            {{/if}}
-        </ul>
-    {{/if}}
-</fieldset>
\ No newline at end of file
diff --git a/templates/sheets/global/partials/inventory-item-V2.hbs b/templates/sheets/global/partials/inventory-item-V2.hbs
new file mode 100644
index 00000000..5329e7b5
--- /dev/null
+++ b/templates/sheets/global/partials/inventory-item-V2.hbs
@@ -0,0 +1,239 @@
+{{!--
+{{> 'daggerheart.inventory-item' }}
+
+Parameters:
+- type {string} : The type of items in the list
+- isActor {boolean} : Passed through to inventory-item partials.
+- categoryAdversary {string} : Category adversary id.
+- noExtensible {boolean} : If true, the inventory-item-content would be collapsable/extendible else it always be showed
+- hideLabels {boolean} : If true, hide label-tags else show label-tags.
+- hideTags {boolean} : If true, hide simple-tags else show simple-tags.
+- hideTooltip {boolean} : If true, disables the tooltip on the item image.
+- hideControls {boolean} : If true, hides the controls inside inventory-item partials.
+- hideDescription {boolean} : If true, hides the item's description.
+- hideResources {boolean} : If true, hides the item's resources.
+- showActions {boolean} : If true show feature's actions.
+--}}
+
+<li class="inventory-item" {{#if (eq type 'action' )}}data-action-id="{{item.id}}" {{/if}}
+  data-item-uuid="{{item.uuid}}" data-type="{{type}}" draggable="true">
+  <div class="inventory-item-header" {{#unless noExtensible}}data-action="toggleExtended" {{/unless}}>
+    {{!-- Image --}}
+    <div class="img-portait"
+      data-action='{{ifThen (hasProperty item "use") "useItem" (ifThen (hasProperty item "toChat") "toChat" "editDoc") }}'
+      {{#unless hideTooltip}}data-tooltip="#item#{{item.uuid}}" {{/unless}}>
+      <img src="{{item.img}}" class="item-img {{#if isActor}}actor-img{{/if}}" />
+      <img class="roll-img" src="systems/daggerheart/assets/icons/dice/default/d20.svg" alt="d20">
+    </div>
+
+    {{!-- Name & Tags --}}
+    <div class="item-label {{#if hideResources}}fullWidth{{/if}}">
+
+      {{!-- Item Name --}}
+      <div class="item-name">{{item.name}}</div>
+
+      {{!-- Weapon Block Start --}}
+      {{#if (eq type 'weapon')}}
+      {{#if (not hideTags)}}
+      <div class="item-tags">
+        <div class="tag">
+          {{localize (concat 'DAGGERHEART.CONFIG.Traits.' item.system.attack.roll.trait '.name')}}
+        </div>
+        <div class="tag">
+          {{localize (concat 'DAGGERHEART.CONFIG.Range.' item.system.attack.range '.name')}}
+        </div>
+        <div class="tag">
+          {{item.system.attack.damage.parts.0.value.dice}}
+          {{#if item.system.attack.damage.parts.0.value.bonus}} +
+          {{item.system.attack.damage.parts.0.value.bonus}}{{/if}}
+          (
+          {{#each item.system.attack.damage.parts.0.type as |type|}}
+
+          {{localize (concat 'DAGGERHEART.CONFIG.DamageType.' type '.abbreviation')}}
+          {{#unless @last}}|{{/unless}}
+          {{/each}}
+          )
+
+        </div>
+        <div class="tag">
+          {{localize (concat 'DAGGERHEART.CONFIG.Burden.' item.system.burden)}}
+        </div>
+      </div>
+      {{else if (not hideLabels)}}
+      <div class="item-labels">
+        <div class="label">
+          {{localize (concat 'DAGGERHEART.CONFIG.Traits.' item.system.attack.roll.trait '.short')}}
+          {{localize (concat 'DAGGERHEART.CONFIG.Range.' item.system.attack.range '.short')}}
+          <span> - </span>
+          {{item.system.attack.damage.parts.0.value.dice}}
+          {{#if item.system.attack.damage.parts.0.value.bonus}} +
+          {{item.system.attack.damage.parts.0.value.bonus}}
+          {{/if}}
+          {{#with (lookup @root.config.GENERAL.damageTypes item.system.attack.damage.parts.0.type)}}
+          {{#each icon}}<i class="fa-solid {{this}}"></i>{{/each}}
+          {{/with}}
+        </div>
+      </div>
+      {{/if}}
+      {{/if}}
+      {{!-- Weapon Block End --}}
+
+      {{!-- Armor Block Start --}}
+      {{#if (eq type 'armor')}}
+      {{#if (not hideTags)}}
+      <div class="item-tags">
+        <div class="tag">{{localize "DAGGERHEART.ITEMS.Armor.baseScore"}}: {{item.system.baseScore}}</div>
+        <div class="tag">
+          {{localize "DAGGERHEART.ITEMS.Armor.baseThresholds.base"}}:
+          {{item.system.baseThresholds.major}} / {{item.system.baseThresholds.severe}}
+        </div>
+      </div>
+      {{else if (not hideLabels)}}
+      <div class="item-labels">
+        <div class="label">
+          {{localize "DAGGERHEART.ITEMS.Armor.baseScore"}}: {{item.system.baseScore}}
+        </div>
+      </div>
+      {{/if}}
+      {{/if}}
+      {{!-- Armor Block End --}}
+
+      {{!-- Domain Card Block Start --}}
+      {{#if (eq type 'domainCard')}}
+      {{#if (not hideTags)}}
+      <div class="item-tags">
+        <div class="tag">{{localize (concat 'DAGGERHEART.CONFIG.DomainCardTypes.' item.system.type)}}</div>
+        <div class="tag">{{localize (concat 'DAGGERHEART.GENERAL.Domain.' item.system.domain '.label')}}</div>
+        <div class="tag">
+          <span class="recall-label">{{localize "DAGGERHEART.ITEMS.DomainCard.recallCost"}}: </span>
+          <span class="recall-value">{{item.system.recallCost}}</span>
+        </div>
+      </div>
+      {{else if (not hideLabels)}}
+      <div class="item-labels">
+        <div class="label">
+          {{localize (concat 'DAGGERHEART.CONFIG.DomainCardTypes.' item.system.type)}} -
+          {{localize (concat 'DAGGERHEART.GENERAL.Domain.' item.system.domain '.label')}} -
+          <span class="recall-value">{{item.system.recallCost}}</span>
+          <i class="fa-solid fa-bolt"></i>
+        </div>
+      </div>
+      {{/if}}
+      {{/if}}
+      {{!-- Domain Card Block End --}}
+
+      {{!-- Effect Block Start --}}
+      {{#if (eq type 'effect')}}
+      {{#if (not hideTags)}}
+      <div class="item-tags">
+        <div class="tag">
+          {{localize item.parent.system.metadata.label}}: {{item.parent.name}}
+        </div>
+        <div class="tag">
+          {{#if item.duration.duration}}
+          {{localize 'DAGGERHEART.EFFECTS.Duration.temporary'}}
+          {{else}}
+          {{localize 'DAGGERHEART.EFFECTS.Duration.passive'}}
+          {{/if}}
+        </div>
+        {{#each item.statuses as |status|}}
+        <div class="tag">{{localize (concat 'DAGGERHEART.CONFIG.Condition.' status '.name')}}</div>
+        {{/each}}
+      </div>
+      {{else if (not hideLabels)}}
+      {{!-- Empty --}}
+      {{/if}}
+      {{/if}}
+      {{!-- Effect Block End --}}
+
+      {{!-- Action Block Start --}}
+      {{#if (eq type 'action')}}
+      {{#if (not hideTags)}}
+      <div class="item-tags">
+        <div class="tag">{{localize (concat 'DAGGERHEART.ACTIONS.TYPES.' item.type '.name')}}</div>
+        <div class="tag">{{localize (concat 'DAGGERHEART.CONFIG.ActionType.' item.actionType)}}</div>
+      </div>
+      {{else if (not hideLabels)}}
+      {{!-- Empty --}}
+      {{/if}}
+      {{/if}}
+      {{!-- Action Block End --}}
+    </div>
+
+    {{!-- Simple Resource --}}
+    {{#if (and (not hideResources) (eq item.system.resource.type 'simple'))}}
+    {{> "systems/daggerheart/templates/sheets/global/partials/item-resource.hbs"}}
+    {{/if}}
+    {{#if (and (not hideResources) item.system.quantity)}}
+    <div class="item-resource">
+      <input type="number" class="inventory-item-quantity" value="{{item.system.quantity}}" step="1" />
+    </div>
+    {{/if}}
+
+    {{!-- Controls --}}
+    {{#unless hideControls}}
+    <div class="controls">
+      {{#if isActor}}
+      <a data-action="editDoc" data-tooltip="DAGGERHEART.UI.Tooltip.openActorWorld">
+        <i class="fa-solid fa-globe"></i>
+      </a>
+      {{#if (eq type 'adversary')}}
+      <a data-action='deleteAdversary' data-category="{{categoryAdversary}}" data-tooltip="CONTROLS.CommonDelete">
+        <i class='fas fa-trash'></i>
+      </a>
+      {{/if}}
+      {{else}}
+      {{#if (eq type 'weapon')}}
+      <a class="{{#unless item.system.equipped}}unequipped{{/unless}}" data-action="toggleEquipItem"
+        data-tooltip="DAGGERHEART.UI.Tooltip.{{ifThen item.system.equipped 'unequip' 'equip' }}">
+        <i class="fa-solid fa-hands"></i>
+      </a>
+      {{else if (eq type 'armor')}}
+      <a class="{{#unless item.system.equipped}}unequipped{{/unless}}" data-action="toggleEquipItem"
+        data-tooltip="DAGGERHEART.UI.Tooltip.{{ifThen item.system.equipped 'unequip' 'equip' }}">
+        <i class="fa-solid fa-shield"></i>
+      </a>
+      {{else if (eq type 'domainCard')}}
+      <a data-action="toggleVault"
+        data-tooltip="DAGGERHEART.UI.Tooltip.{{ifThen item.system.inVault 'sendToLoadout' 'sendToVault' }}">
+        <i class="fa-solid {{ifThen item.system.inVault 'fa-arrow-up' 'fa-arrow-down'}}"></i>
+      </a>
+      {{else if (eq type 'effect')}}
+      <a data-action="toggleEffect"
+        data-tooltip="DAGGERHEART.UI.Tooltip.{{ifThen item.disabled 'enableEffect' 'disableEffect' }}">
+        <i class="{{ifThen item.disabled 'fa-regular fa-lightbulb' 'fa-solid fa-lightbulb'}}"></i>
+      </a>
+      {{/if}}
+      {{#if (hasProperty item "toChat")}}
+      <a data-action="toChat" data-tooltip="DAGGERHEART.UI.Tooltip.sendToChat">
+        <i class="fa-regular fa-message"></i>
+      </a>
+      {{/if}}
+      <a data-action="triggerContextMenu" data-tooltip="DAGGERHEART.UI.Tooltip.moreOptions">
+        <i class="fa-solid fa-ellipsis-vertical"></i>
+      </a>
+      {{/if}}
+    </div>
+    {{/unless}}
+  </div>
+  <div class="inventory-item-content{{#unless noExtensible}} extensible{{/unless}}">
+    {{!-- Description --}}
+    {{#unless hideDescription}}
+    <div class="invetory-description"></div>
+    {{/unless}}
+    {{!-- Dice Resource --}}
+    {{#if (and (not hideResources) (eq item.system.resource.type 'diceValue'))}}
+    {{> "systems/daggerheart/templates/sheets/global/partials/item-resource.hbs"}}
+    {{/if}}
+    {{!-- Actions Buttons --}}
+    {{#if (and showActions (eq item.type 'feature'))}}
+    <div class="item-buttons">
+      {{#each item.system.actions as | action |}}
+      <button type="button" data-action="useAction" data-action-id="{{action.id}}">
+        {{action.name}}
+      </button>
+      {{/each}}
+    </div>
+    {{/if}}
+  </div>
+</li>
\ No newline at end of file
diff --git a/templates/sheets/global/partials/inventory-item.hbs b/templates/sheets/global/partials/inventory-item.hbs
deleted file mode 100644
index a6373c08..00000000
--- a/templates/sheets/global/partials/inventory-item.hbs
+++ /dev/null
@@ -1,197 +0,0 @@
-<li class="inventory-item" data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}" data-type="{{type}}" draggable="true">
-    <img src="{{item.img}}" class="item-img {{#if isActor}}actor-img{{/if}}" data-action="useItem" {{#if (not noTooltip)}}data-tooltip="{{concat "#item#" item.uuid}}"{{/if}} />
-    <div class="item-label-wrapper">
-        <div class="item-label {{#unless (and (not isSidebar) (or (eq item.system.resource.type 'simple') item.system.quantity))}}fullWidth{{/unless}}">
-            {{#if isCompanion}}
-                <a class="item-name" data-action="attackRoll">{{item.name}}</a>
-            {{else}}
-                <div class="item-name">{{item.name}}</div>
-            {{/if}}
-            {{#if  (eq type 'weapon')}} 
-                <div class="item-tags">
-                    {{#if isSidebar}}
-                        <div class="item-labels">
-                            <div class="label">
-                                {{localize (concat 'DAGGERHEART.CONFIG.Traits.' item.system.attack.roll.trait '.short')}}
-                                {{localize (concat 'DAGGERHEART.CONFIG.Range.' item.system.attack.range '.short')}}
-                                <span> - </span>
-                                {{item.system.attack.damage.parts.0.value.dice}}{{#if item.system.attack.damage.parts.0.value.bonus}} + {{item.system.attack.damage.parts.0.value.bonus}}{{/if}}
-                                {{#each item.system.attack.damage.parts.0.type as | type | }}
-                                    {{#with (lookup @root.config.GENERAL.damageTypes type)}}
-                                        <i class="fa-solid {{icon}}"></i>
-                                    {{/with}}
-                                {{/each}}
-                            </div>
-                        </div>
-                    {{else}}
-                        <div class="tag">
-                            {{localize (concat 'DAGGERHEART.CONFIG.Traits.' item.system.attack.roll.trait '.name')}}
-                        </div>
-                        <div class="tag">
-                            {{localize (concat 'DAGGERHEART.CONFIG.Range.' item.system.attack.range '.name')}}
-                        </div>
-                        <div class="tag">
-                            {{item.system.attack.damage.parts.0.value.dice}}{{#if item.system.attack.damage.parts.0.value.bonus}} + {{item.system.attack.damage.parts.0.value.bonus}}{{/if}}
-                            (
-                                {{#each item.system.attack.damage.parts.0.type}}
-                                    {{localize (concat 'DAGGERHEART.CONFIG.DamageType.' this '.abbreviation')}}
-                                {{/each}}
-                            )
-                        </div>
-                        <div class="tag">
-                            {{localize (concat 'DAGGERHEART.CONFIG.Burden.' item.system.burden)}}
-                        </div>
-                    {{/if}}
-                </div>
-            {{/if}}
-            {{#if  (eq type 'armor')}}
-                {{#if isSidebar}}
-                    <div class="item-labels">
-                        <div class="label">
-                            {{localize "DAGGERHEART.ITEMS.Armor.baseScore"}}:
-                            {{item.system.baseScore}}
-                        </div>
-                    </div>
-                {{else}}
-                    <div class="item-tags">
-                        <div class="tag">
-                            {{localize "DAGGERHEART.ITEMS.Armor.baseScore"}}:
-                            {{item.system.baseScore}}
-                        </div>
-                        <div class="tag">
-                            {{localize "DAGGERHEART.ITEMS.Armor.baseThresholds.base"}}:
-                            {{item.system.baseThresholds.major}}
-                            <span>/</span>
-                            {{item.system.baseThresholds.severe}}
-                        </div>
-                    </div>
-                {{/if}}
-            {{/if}}
-            {{#if  (eq type 'domainCard')}}
-                {{#if isSidebar}}
-                    <div class="item-labels">
-                        <div class="label">
-                            {{localize (concat 'DAGGERHEART.CONFIG.DomainCardTypes.' item.system.type)}}
-                            <span> - </span>
-                            {{localize (concat 'DAGGERHEART.GENERAL.Domain.' item.system.domain '.label')}}
-                            <span> - </span>
-                            <span class="recall-value">{{item.system.recallCost}}</span>
-                            <i class="fa-solid fa-bolt"></i>
-                        </div>
-                    </div>
-                {{else}}
-                    <div class="item-tags">
-                        <div class="tag">
-                            {{localize (concat 'DAGGERHEART.CONFIG.DomainCardTypes.' item.system.type)}}
-                        </div>
-                        <div class="tag">
-                            {{localize (concat 'DAGGERHEART.GENERAL.Domain.' item.system.domain '.label')}}
-                        </div>
-                        <div class="tag">
-                            <span class="recall-label">{{localize "DAGGERHEART.ITEMS.DomainCard.recallCost"}}: </span>
-                            <span class="recall-value">{{item.system.recallCost}}</span>
-                        </div>
-                    </div>
-                {{/if}}
-            {{/if}}
-            {{#if  (eq type 'effect')}}
-                <div class="item-tags">
-                    <div class="tag">
-                        {{localize (concat 'TYPES.Item.' item.parent.type)}}
-                        <span>: </span>
-                        {{item.parent.name}}
-                    </div>
-                    <div class="tag">
-                        {{#if item.duration.duration}}
-                            {{localize 'DAGGERHEART.EFFECTS.Duration.temporary'}}
-                        {{else}}
-                            {{localize 'DAGGERHEART.EFFECTS.Duration.passive'}}
-                        {{/if}}
-                    </div>
-                    {{#each item.statuses as |status|}}
-                        <div class="tag">
-                            {{localize (concat 'DAGGERHEART.CONFIG.Condition.' status '.name')}}
-                        </div>
-                    {{/each}}
-                </div>
-            {{/if}}
-            {{#if  (eq type 'action')}}
-                <div class="item-tags">
-                    <div class="tag">
-                        {{localize (concat 'DAGGERHEART.ACTIONS.TYPES.' item.type '.name')}}
-                    </div>
-                    <div class="tag">
-                        {{localize (concat 'DAGGERHEART.CONFIG.ActionType.' item.actionType)}}
-                    </div>
-                </div>
-            {{/if}}
-        </div>
-        {{#if (and (not isSidebar) (eq item.system.resource.type 'simple'))}}
-            {{> "systems/daggerheart/templates/sheets/global/partials/item-resource.hbs"}}
-        {{/if}}
-        {{#if (and (not isSidebar) item.system.quantity)}}
-            <div class="item-resource">
-                <input type="number" class="inventory-item-quantity" value="{{item.system.quantity}}" step="1" />
-            </div>
-        {{/if}}
-    </div>
-    {{#unless hideControls}}
-        {{#if isActor}}
-            <div class="controls">
-                {{#if (eq type 'actor')}}
-                    <a data-action="viewActor" data-potential-adversary="{{categoryAdversary}}" data-adversary="{{item.uuid}}" data-tooltip='{{localize "DAGGERHEART.UI.Tooltip.openActorWorld"}}'>
-                        <i class="fa-solid fa-globe"></i>
-                    </a>
-                {{/if}}
-                {{#if (eq type 'adversary')}}
-                    <a data-action="viewAdversary" data-potential-adversary="{{categoryAdversary}}" data-adversary="{{item.uuid}}" data-tooltip='{{localize "DAGGERHEART.UI.Tooltip.openActorWorld"}}'>
-                        <i class="fa-solid fa-globe"></i>
-                    </a>
-                    <a data-action='deleteAdversary' data-potential-adversary="{{categoryAdversary}}" data-adversary="{{item.uuid}}" data-tooltip='{{localize "CONTROLS.CommonDelete"}}'>
-                        <i class='fas fa-trash'></i>
-                    </a>
-                {{/if}}
-            </div>
-        {{else}}
-            <div class="controls">
-                {{#if (eq type 'weapon')}}
-                    <a class="{{#unless item.system.equipped}}unequipped{{/unless}}" data-action="toggleEquipItem" data-tooltip="{{#unless item.system.equipped}}{{localize 'DAGGERHEART.UI.Tooltip.equip'}}{{else}}{{localize 'DAGGERHEART.UI.Tooltip.unequip'}}{{/unless}}">
-                        <i class="fa-solid fa-hands"></i>
-                    </a>
-                {{/if}}
-                {{#if (eq type 'armor')}}
-                    <a class="{{#unless item.system.equipped}}unequipped{{/unless}}" data-action="toggleEquipItem" data-tooltip="{{#unless item.system.equipped}}{{localize 'DAGGERHEART.UI.Tooltip.equip'}}{{else}}{{localize 'DAGGERHEART.UI.Tooltip.unequip'}}{{/unless}}">
-                    <i class="fa-solid fa-shield"></i>
-                    </a>
-                {{/if}}
-                {{#if (eq type 'domainCard')}}
-                    {{#unless item.system.inVault}}
-                        <a data-action="toggleVault" data-tooltip="{{localize 'DAGGERHEART.UI.Tooltip.sendToVault'}}">
-                            <i class="fa-solid fa-arrow-down"></i>
-                        </a>
-                    {{else}}
-                        <a data-action="toggleVault" data-tooltip="{{localize 'DAGGERHEART.UI.Tooltip.sendToLoadout'}}">
-                            <i class="fa-solid fa-arrow-up"></i>
-                        </a>
-                    {{/unless}}
-                    
-                {{/if}}
-                <a data-action="toChat" data-tooltip="{{localize 'DAGGERHEART.UI.Tooltip.sendToChat'}}"><i class="fa-regular fa-message"></i></a>
-                <a data-action="triggerContextMenu" data-tooltip="{{localize 'DAGGERHEART.UI.Tooltip.moreOptions'}}"><i class="fa-solid fa-ellipsis-vertical"></i></a>
-            </div>
-        {{/if}}
-    {{else}}
-        <span></span>
-    {{/unless}}
-    <div class="item-description">{{#unless isSidebar}}{{{item.system.description}}}{{/unless}}</div>
-    {{#if (and (not isSidebar) (eq item.system.resource.type 'diceValue'))}}
-        {{> "systems/daggerheart/templates/sheets/global/partials/item-resource.hbs"}}
-    {{/if}}
-    {{#if featureType}}
-        <div class="item-buttons">
-            {{#each item.system.actions as | action |}}
-                <button type="button" data-action="useAction" data-action-id="{{action.id}}">{{action.name}}</button>
-            {{/each}}
-        </div>
-    {{/if}}
-</li>
\ No newline at end of file
diff --git a/templates/sheets/global/tabs/tab-actions.hbs b/templates/sheets/global/tabs/tab-actions.hbs
index ed71c45f..584cf782 100644
--- a/templates/sheets/global/tabs/tab-actions.hbs
+++ b/templates/sheets/global/tabs/tab-actions.hbs
@@ -3,22 +3,11 @@
     data-tab='{{tabs.actions.id}}'
     data-group='{{tabs.actions.group}}'
 >
-    <fieldset class="one-column">
-        <legend>{{localize "DAGGERHEART.GENERAL.Action.plural"}} <a><i class="fa-solid fa-plus icon-button" data-action="addAction"></i></a></legend>
-        <div class="actions-list">
-            {{#each document.system.actions as |action index|}}
-                <div class="action-item"
-                    data-action="editAction"
-                    data-index="{{index}}"
-                    data-tooltip="{{concat "#item#" @root.document.uuid "#action#" action.id}}"
-                >
-                    <img class="image" src="{{action.img}}" />
-                    <span>{{action.name}}</span>
-                    <div class="controls">
-                        <a data-action="removeAction"><i class="fa-solid fa-trash"></i></a>
-                    </div>
-                </div> 
-            {{/each}}
-        </div>
-    </fieldset>
+
+{{> 'daggerheart.inventory-items'
+    title='DAGGERHEART.GENERAL.Action.plural'
+    collection=document.system.actions
+    type='action'
+    canCreate=true
+}}
 </section>
\ No newline at end of file
diff --git a/templates/sheets/global/tabs/tab-effects.hbs b/templates/sheets/global/tabs/tab-effects.hbs
index a75f1b0b..c89c6ff4 100644
--- a/templates/sheets/global/tabs/tab-effects.hbs
+++ b/templates/sheets/global/tabs/tab-effects.hbs
@@ -1,26 +1,21 @@
-<section
-    class='tab {{tabs.effects.cssClass}} {{tabs.effects.id}}'
-    data-tab='{{tabs.effects.id}}'
-    data-group='{{tabs.effects.group}}'
->
-    <fieldset class="one-column">
-            <legend>
-                {{localize "DAGGERHEART.GENERAL.Effect.plural"}} 
-                <a data-action="createDoc" data-document-class="ActiveEffect" data-type="base">
-                    <i class="fa-solid fa-plus icon-button"></i>
-                </a>
-            </legend>
-        <div class="effects-list">
-            {{#each document.effects as |effect|}}
-                <div class="effect-item">
-                    <img class="image" src="{{effect.img}}" />
-                    <span>{{effect.name}}</span>
-                    <div class="controls">
-                        <a data-action="editDoc" data-type="ActiveEffect" data-doc-id="{{effect.id}}"><i class="fa-solid fa-pen-to-square"></i></a>
-                        <a data-action="deleteDoc" data-type="ActiveEffect" data-doc-id="{{effect.id}}" {{disabled effect.mandatory}}><i class="fa-solid fa-trash icon-button {{disabled effect.mandatory}}"></i></a>
-                    </div>
-                </div> 
-            {{/each}}
-        </div>
-    </fieldset>
+<section class='tab {{tabs.effects.cssClass}} {{tabs.effects.id}}' data-tab='{{tabs.effects.id}}'
+    data-group='{{tabs.effects.group}}'>
+
+    {{> 'daggerheart.inventory-items'
+    title='DAGGERHEART.GENERAL.activeEffects'
+    type='effect'
+    isGlassy=true
+    collection=effects.actives
+    canCreate=true
+    hideResources=true
+    }}
+
+    {{> 'daggerheart.inventory-items'
+    title='DAGGERHEART.GENERAL.inactiveEffects'
+    type='effect'
+    isGlassy=true
+    collection=effects.inactives
+    canCreate=true
+    hideResources=true
+    }}
 </section>
\ No newline at end of file
diff --git a/templates/sheets/global/tabs/tab-feature-section.hbs b/templates/sheets/global/tabs/tab-feature-section.hbs
deleted file mode 100644
index ca6af184..00000000
--- a/templates/sheets/global/tabs/tab-feature-section.hbs
+++ /dev/null
@@ -1,14 +0,0 @@
-<section
-    class='tab {{tabs.features.cssClass}} {{tabs.features.id}}'
-    data-tab='{{tabs.features.id}}'
-    data-group='{{tabs.features.group}}'
->
-    <fieldset>
-        <legend>{{localize "DAGGERHEART.GENERAL.Tabs.features"}}</legend>
-        <div class="feature-list">
-            {{#each source.system.abilities as |feature key|}}
-                {{> 'systems/daggerheart/templates/sheets/global/partials/feature-section-item.hbs' feature=feature}}
-            {{/each}}
-        </div>
-    </fieldset>
-</section>
\ No newline at end of file
diff --git a/templates/sheets/global/tabs/tab-features.hbs b/templates/sheets/global/tabs/tab-features.hbs
index eced83d7..b70b33d3 100644
--- a/templates/sheets/global/tabs/tab-features.hbs
+++ b/templates/sheets/global/tabs/tab-features.hbs
@@ -1,23 +1,11 @@
-<section
-    class='tab {{tabs.features.cssClass}} {{tabs.features.id}}'
-    data-tab='{{tabs.features.id}}'
-    data-group='{{tabs.features.group}}'
->
-    <fieldset class="one-column drop-section">
-        <legend>{{localize "DAGGERHEART.GENERAL.features"}} <a><i data-action="addFeature" class="fa-solid fa-plus icon-button"></i></a></legend>
-        <div class="features-list">
-            {{#each document.system.features as |feature|}}
-                <div class="feature-item"
-                    data-action="editFeature"
-                    id="{{feature.id}}"
-                >
-                    <img class="image" src="{{feature.img}}" data-tooltip="{{concat "#item#" feature.uuid}}" />
-                    <span>{{feature.name}}</span>
-                    <div class="controls">
-                        <a data-action="removeFeature" id="{{feature.id}}"><i class="fa-solid fa-trash"></i></a>
-                    </div>
-                </div> 
-            {{/each}}
-        </div>
-    </fieldset>
+<section class='tab {{tabs.features.cssClass}} {{tabs.features.id}}' data-tab='{{tabs.features.id}}'
+    data-group='{{tabs.features.group}}'>
+    {{> 'daggerheart.inventory-items'
+    title='DAGGERHEART.GENERAL.features'
+    type='feature'
+    isGlassy=true
+    collection=document.system.features
+    canCreate=(or document.parent isGM)
+    showActions=false
+    }}
 </section>
\ No newline at end of file
diff --git a/templates/sheets/items/class/settings.hbs b/templates/sheets/items/class/settings.hbs
index b110bf4c..756687b4 100644
--- a/templates/sheets/items/class/settings.hbs
+++ b/templates/sheets/items/class/settings.hbs
@@ -38,7 +38,7 @@
                 <legend>{{localize "DAGGERHEART.ITEMS.Class.guide.suggestedPrimaryWeaponTitle"}}</legend>
                 <div class="drop-section-body list-items">
                     {{#if document.system.characterGuide.suggestedPrimaryWeapon}}
-                        <div class="suggested-item item-line" data-action="viewDoc" data-uuid="{{document.system.characterGuide.suggestedPrimaryWeapon.uuid}}">
+                        <div class="suggested-item item-line" data-action="editDoc" data-item-uuid="{{document.system.characterGuide.suggestedPrimaryWeapon.uuid}}">
                             <img class="image" src="{{document.system.characterGuide.suggestedPrimaryWeapon.img}}" />
                             <span>{{document.system.characterGuide.suggestedPrimaryWeapon.name}}</span>
                             <div class="controls">
@@ -53,7 +53,7 @@
                 <legend>{{localize "DAGGERHEART.ITEMS.Class.guide.suggestedSecondaryWeaponTitle"}}</legend>
                 <div class="drop-section-body list-items">
                     {{#if document.system.characterGuide.suggestedSecondaryWeapon}}
-                        <div class="suggested-item item-line" data-action="viewDoc" data-uuid="{{system.system.characterGuide.suggestedSecondaryWeapon.uuid}}">
+                        <div class="suggested-item item-line" data-action="editDoc" data-item-uuid="{{system.system.characterGuide.suggestedSecondaryWeapon.uuid}}">
                             <img class="image" src="{{document.system.characterGuide.suggestedSecondaryWeapon.img}}" />
                             <span>{{document.system.characterGuide.suggestedSecondaryWeapon.name}}</span>
                             <div class="controls">
@@ -68,7 +68,7 @@
                 <legend>{{localize "DAGGERHEART.ITEMS.Class.guide.suggestedArmorTitle"}}</legend>
                 <div class="drop-section-body list-items">
                     {{#if document.system.characterGuide.suggestedArmor}}
-                        <div class="suggested-item item-line" data-action="viewDoc" data-uuid="{{document.system.characterGuide.suggestedArmor.uuid}}">
+                        <div class="suggested-item item-line" data-action="editDoc" data-item-uuid="{{document.system.characterGuide.suggestedArmor.uuid}}">
                             <img class="image" src="{{document.system.characterGuide.suggestedArmor.img}}" />
                             <span>{{document.system.characterGuide.suggestedArmor.name}}</span>
                             <div class="controls">
@@ -86,7 +86,7 @@
                 <legend>{{localize "DAGGERHEART.GENERAL.take"}}</legend>
                 <div class="drop-section-body list-items">
                     {{#each source.system.inventory.take}}
-                        <div class="suggested-item item-line" data-action="viewDoc" data-uuid="{{this.uuid}}">
+                        <div class="suggested-item item-line" data-action="editDoc" data-item-uuid="{{this.uuid}}">
                             <img class="image" src="{{this.img}}" />
                             <span>{{this.name}}</span>
                             <div class="controls">
@@ -101,7 +101,7 @@
                 <legend>{{localize "DAGGERHEART.ITEMS.Class.guide.inventory.thenChoose"}}</legend>
                 <div class="drop-section-body list-items">
                     {{#each source.system.inventory.choiceA}}
-                        <div class="suggested-item item-line" data-action="viewDoc" data-uuid="{{this.uuid}}">
+                        <div class="suggested-item item-line" data-action="editDoc" data-item-uuid="{{this.uuid}}">
                             <img class="image" src="{{this.img}}" />
                             <span>{{this.name}}</span>
                             <div class="controls">
@@ -116,7 +116,7 @@
                 <legend>{{localize "DAGGERHEART.ITEMS.Class.guide.inventory.andEither"}}</legend>
                 <div class="drop-section-body list-items">
                     {{#each source.system.inventory.choiceB}}
-                        <div class="suggested-item item-line" data-action="viewDoc" data-uuid="{{this.uuid}}">
+                        <div class="suggested-item item-line" data-action="editDoc" data-item-uuid="{{this.uuid}}">
                             <img class="image" src="{{this.img}}" />
                             <span>{{this.name}}</span>
                             <div class="controls">