From 3a6a973ea2ee7fc5ad02a6a687b98d7c16c12ff6 Mon Sep 17 00:00:00 2001
From: Murilo Brito <91566541+moliloo@users.noreply.github.com>
Date: Wed, 2 Jul 2025 09:30:36 -0300
Subject: [PATCH] [Feature] New Environment Sheet (#243)

* rework new environment template sheet, add environment-settings sheet, improve adversary-settings sheet and  delete legacy actor sheet templates

* Potential Adversaries can be dragged out of the sheet onto canvas

* Added ToChat and UseItem

---------

Co-authored-by: WBHarry <williambjrklund@gmail.com>
---
 lang/en.json                                  |  19 +-
 module/applications/_module.mjs               |   2 +-
 .../sheets/actors/environment.mjs             | 131 +++++++
 .../applications/adversary-settings.mjs       |   1 -
 .../applications/environment-settings.mjs     | 213 +++++++++++
 .../applications/sheets/daggerheart-sheet.mjs |   3 +-
 module/applications/sheets/environment.mjs    | 107 ------
 module/config/actorConfig.mjs                 |  16 +-
 module/data/actor/environment.mjs             |  12 +-
 styles/daggerheart.css                        | 350 ++++++++++++++----
 styles/daggerheart.less                       |   7 +
 styles/less/actors/adversary/header.less      |  72 ----
 styles/less/actors/environment/header.less    | 140 +++++++
 styles/less/actors/environment/sheet.less     |  18 +
 .../adversary-settings/actions.less           |  12 +
 .../environment-settings/actions.less         |  74 ++++
 .../environment-settings/adversaries.less     |  50 +++
 styles/less/global/inventory-item.less        |   6 +-
 styles/less/global/tab-actions.less           |   7 +
 .../sheets/actors/adversary/information.hbs   |  17 -
 templates/sheets/actors/adversary/main.hbs    |  43 ---
 .../sheets/actors/environment/actions.hbs     |   9 +
 .../sheets/actors/environment/header.hbs      |  50 ++-
 .../sheets/actors/environment/information.hbs |  16 -
 templates/sheets/actors/environment/main.hbs  |  37 --
 templates/sheets/actors/environment/notes.hbs |  10 +
 .../environment/potentialAdversaries.hbs      |  11 +
 templates/sheets/adversary.hbs                | 238 ------------
 .../environment-settings/actions.hbs          |  34 ++
 .../environment-settings/adversaries.hbs      |  28 ++
 .../environment-settings/details.hbs          |  16 +
 .../environment-settings/header.hbs           |   3 +
 templates/sheets/character/character.hbs      | 151 --------
 .../character/parts/advancementCard.hbs       |  27 --
 .../sheets/character/parts/heritageCard.hbs   |  18 -
 .../sheets/character/sections/inventory.hbs   |  35 --
 .../sheets/character/sections/loadout.hbs     | 137 -------
 templates/sheets/environment.hbs              | 111 ------
 .../partials/inventory-fieldset-items.hbs     |   3 +
 .../sheets/global/partials/inventory-item.hbs |  69 ++--
 40 files changed, 1160 insertions(+), 1143 deletions(-)
 create mode 100644 module/applications/sheets/actors/environment.mjs
 create mode 100644 module/applications/sheets/applications/environment-settings.mjs
 delete mode 100644 module/applications/sheets/environment.mjs
 create mode 100644 styles/less/actors/environment/header.less
 create mode 100644 styles/less/actors/environment/sheet.less
 create mode 100644 styles/less/applications/environment-settings/actions.less
 create mode 100644 styles/less/applications/environment-settings/adversaries.less
 delete mode 100644 templates/sheets/actors/adversary/information.hbs
 delete mode 100644 templates/sheets/actors/adversary/main.hbs
 create mode 100644 templates/sheets/actors/environment/actions.hbs
 delete mode 100644 templates/sheets/actors/environment/information.hbs
 delete mode 100644 templates/sheets/actors/environment/main.hbs
 create mode 100644 templates/sheets/actors/environment/notes.hbs
 create mode 100644 templates/sheets/actors/environment/potentialAdversaries.hbs
 delete mode 100644 templates/sheets/adversary.hbs
 create mode 100644 templates/sheets/applications/environment-settings/actions.hbs
 create mode 100644 templates/sheets/applications/environment-settings/adversaries.hbs
 create mode 100644 templates/sheets/applications/environment-settings/details.hbs
 create mode 100644 templates/sheets/applications/environment-settings/header.hbs
 delete mode 100644 templates/sheets/character/character.hbs
 delete mode 100644 templates/sheets/character/parts/advancementCard.hbs
 delete mode 100644 templates/sheets/character/parts/heritageCard.hbs
 delete mode 100644 templates/sheets/character/sections/inventory.hbs
 delete mode 100644 templates/sheets/character/sections/loadout.hbs
 delete mode 100644 templates/sheets/environment.hbs

diff --git a/lang/en.json b/lang/en.json
index 8c3897c5..4458d9ac 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -229,7 +229,9 @@
                 "attack": "Attack",
                 "experiences": "Experiences",
                 "features": "Features",
-                "actions": "Actions"
+                "actions": "Actions",
+                "potentialAdversaries": "Potential Adversaries",
+                "adversaries": "Adversaries"
             },
             "basics": "Basics"
         },
@@ -381,19 +383,19 @@
         },
         "Environment": {
             "Type": {
-                "Exploration": {
+                "exploration": {
                     "label": "Exploration",
                     "description": ""
                 },
-                "Social": {
+                "social": {
                     "label": "Social",
                     "description": ""
                 },
-                "Traversal": {
+                "traversal": {
                     "label": "Traversal",
                     "description": ""
                 },
-                "Event": {
+                "event": {
                     "label": "Event",
                     "description": ""
                 }
@@ -1364,6 +1366,12 @@
                     },
                     "difficulty": {
                         "label": "Difficulty"
+                    },
+                    "impulses": {
+                        "label": "Impulses"
+                    },
+                    "description": {
+                        "label": "Description"
                     }
                 },
                 "Tabs": {
@@ -1577,6 +1585,7 @@
         },
         "Tooltip": {
             "openItemWorld": "Open Item World",
+            "openActorWorld": "Open Actor World",
             "sendToChat": "Send to Chat",
             "moreOptions": "More Options",
             "equip": "Equip",
diff --git a/module/applications/_module.mjs b/module/applications/_module.mjs
index df22d6b2..a74cb8cf 100644
--- a/module/applications/_module.mjs
+++ b/module/applications/_module.mjs
@@ -12,7 +12,7 @@ export { default as DhpConsumable } from './sheets/items/consumable.mjs';
 export { default as DhpWeapon } from './sheets/items/weapon.mjs';
 export { default as DhpArmor } from './sheets/items/armor.mjs';
 export { default as DhpChatMessage } from './chatMessage.mjs';
-export { default as DhpEnvironment } from './sheets/environment.mjs';
+export { default as DhpEnvironment } from './sheets/actors/environment.mjs';
 export { default as DhActiveEffectConfig } from './sheets/activeEffectConfig.mjs';
 export { default as DhContextMenu } from './contextMenu.mjs';
 
diff --git a/module/applications/sheets/actors/environment.mjs b/module/applications/sheets/actors/environment.mjs
new file mode 100644
index 00000000..1440bb4e
--- /dev/null
+++ b/module/applications/sheets/actors/environment.mjs
@@ -0,0 +1,131 @@
+import DaggerheartSheet from '../daggerheart-sheet.mjs';
+import DHEnvironmentSettings from '../applications/environment-settings.mjs';
+
+const { ActorSheetV2 } = foundry.applications.sheets;
+export default class DhpEnvironment extends DaggerheartSheet(ActorSheetV2) {
+    static DEFAULT_OPTIONS = {
+        tag: 'form',
+        classes: ['daggerheart', 'sheet', 'actor', 'dh-style', 'environment'],
+        position: {
+            width: 500
+        },
+        actions: {
+            addAdversary: this.addAdversary,
+            deleteProperty: this.deleteProperty,
+            viewAdversary: this.viewAdversary,
+            openSettings: this.openSettings,
+            useItem: this.useItem,
+            toChat: this.toChat
+        },
+        form: {
+            handler: this._updateForm,
+            submitOnChange: true,
+            closeOnSubmit: false
+        },
+        dragDrop: [{ dragSelector: '.action-section .inventory-item', dropSelector: null }]
+    };
+
+    static PARTS = {
+        header: { template: 'systems/daggerheart/templates/sheets/actors/environment/header.hbs' },
+        actions: { template: 'systems/daggerheart/templates/sheets/actors/environment/actions.hbs' },
+        potentialAdversaries: {
+            template: 'systems/daggerheart/templates/sheets/actors/environment/potentialAdversaries.hbs'
+        },
+        notes: { template: 'systems/daggerheart/templates/sheets/actors/environment/notes.hbs' }
+    };
+
+    static TABS = {
+        actions: {
+            active: true,
+            cssClass: '',
+            group: 'primary',
+            id: 'actions',
+            icon: null,
+            label: 'DAGGERHEART.General.tabs.actions'
+        },
+        potentialAdversaries: {
+            active: false,
+            cssClass: '',
+            group: 'primary',
+            id: 'potentialAdversaries',
+            icon: null,
+            label: 'DAGGERHEART.General.tabs.potentialAdversaries'
+        },
+        notes: {
+            active: false,
+            cssClass: '',
+            group: 'primary',
+            id: 'notes',
+            icon: null,
+            label: 'DAGGERHEART.Sheets.Adversary.Tabs.notes'
+        }
+    };
+
+    async _prepareContext(_options) {
+        const context = await super._prepareContext(_options);
+        context.document = this.document;
+        context.tabs = super._getTabs(this.constructor.TABS);
+        context.getEffectDetails = this.getEffectDetails.bind(this);
+
+        return context;
+    }
+
+    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 openSettings() {
+        await new DHEnvironmentSettings(this.document).render(true);
+    }
+
+    static async _updateForm(event, _, formData) {
+        await this.document.update(formData.object);
+        this.render();
+    }
+
+    getEffectDetails(id) {
+        return {};
+    }
+
+    static async addAdversary() {
+        await this.document.update({
+            [`system.potentialAdversaries.${foundry.utils.randomID()}.label`]: game.i18n.localize(
+                'DAGGERHEART.Sheets.Environment.newAdversary'
+            )
+        });
+        this.render();
+    }
+
+    static async deleteProperty(_, target) {
+        await this.document.update({ [`${target.dataset.path}.-=${target.id}`]: null });
+        this.render();
+    }
+
+    static async viewAdversary(_, button) {
+        const adversary = await foundry.utils.fromUuid(button.dataset.adversary);
+        adversary.sheet.render(true);
+    }
+
+    static async useItem(event) {
+        const action = this.getAction(event);
+        action.use(event);
+    }
+
+    static async toChat(event) {
+        const item = this.getAction(event);
+        item.toChat(this.document.id);
+    }
+
+    async _onDragStart(event) {
+        const item = event.currentTarget.closest('.inventory-item');
+
+        if (item) {
+            const adversary = game.actors.find(x => x.type === 'adversary' && x.id === item.dataset.itemId);
+            const adversaryData = { type: 'Actor', uuid: adversary.uuid };
+            event.dataTransfer.setData('text/plain', JSON.stringify(adversaryData));
+            event.dataTransfer.setDragImage(item, 60, 0);
+        }
+    }
+}
diff --git a/module/applications/sheets/applications/adversary-settings.mjs b/module/applications/sheets/applications/adversary-settings.mjs
index 4c7ae8ec..2ecdcb60 100644
--- a/module/applications/sheets/applications/adversary-settings.mjs
+++ b/module/applications/sheets/applications/adversary-settings.mjs
@@ -146,7 +146,6 @@ export default class DHAdversarySettings extends HandlebarsApplicationMixin(Appl
                         parent: this.actor
                     }
                 );
-            console.log(action);
             await this.actor.update({ 'system.actions': [...this.actor.system.actions, action] });
             await new DHActionConfig(this.actor.system.actions[this.actor.system.actions.length - 1]).render({
                 force: true
diff --git a/module/applications/sheets/applications/environment-settings.mjs b/module/applications/sheets/applications/environment-settings.mjs
new file mode 100644
index 00000000..1f3c33c8
--- /dev/null
+++ b/module/applications/sheets/applications/environment-settings.mjs
@@ -0,0 +1,213 @@
+import DHActionConfig from '../../config/Action.mjs';
+import DHBaseItemSheet from '../api/base-item.mjs';
+import { actionsTypes } from '../../../data/_module.mjs';
+
+const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api;
+
+export default class DHEnvironmentSettings extends HandlebarsApplicationMixin(ApplicationV2) {
+    constructor(actor) {
+        super({});
+
+        this.actor = actor;
+        this._dragDrop = this._createDragDropHandlers();
+    }
+
+    get title() {
+        return `${game.i18n.localize('DAGGERHEART.Sheets.TABS.settings')}`;
+    }
+
+    static DEFAULT_OPTIONS = {
+        tag: 'form',
+        classes: ['daggerheart', 'dh-style', 'dialog', 'environment-settings'],
+        window: {
+            icon: 'fa-solid fa-wrench',
+            resizable: false
+        },
+        position: { width: 455, height: 'auto' },
+        actions: {
+            addAction: this.#addAction,
+            editAction: this.#editAction,
+            removeAction: this.#removeAction,
+            addCategory: this.#addCategory,
+            deleteProperty: this.#deleteProperty,
+            viewAdversary: this.#viewAdversary,
+            deleteAdversary: this.#deleteAdversary
+        },
+        form: {
+            handler: this.updateForm,
+            submitOnChange: true,
+            closeOnSubmit: false
+        },
+        dragDrop: [{ dragSelector: null, dropSelector: '.category-container' }]
+    };
+
+    static PARTS = {
+        header: {
+            id: 'header',
+            template: 'systems/daggerheart/templates/sheets/applications/environment-settings/header.hbs'
+        },
+        tabs: { template: 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs' },
+        details: {
+            id: 'details',
+            template: 'systems/daggerheart/templates/sheets/applications/environment-settings/details.hbs'
+        },
+        actions: {
+            id: 'actions',
+            template: 'systems/daggerheart/templates/sheets/applications/environment-settings/actions.hbs'
+        },
+        adversaries: {
+            id: 'adversaries',
+            template: 'systems/daggerheart/templates/sheets/applications/environment-settings/adversaries.hbs'
+        }
+    };
+
+    static TABS = {
+        details: {
+            active: true,
+            cssClass: '',
+            group: 'primary',
+            id: 'details',
+            icon: null,
+            label: 'DAGGERHEART.General.tabs.details'
+        },
+        actions: {
+            active: false,
+            cssClass: '',
+            group: 'primary',
+            id: 'actions',
+            icon: null,
+            label: 'DAGGERHEART.General.tabs.actions'
+        },
+        adversaries: {
+            active: false,
+            cssClass: '',
+            group: 'primary',
+            id: 'adversaries',
+            icon: null,
+            label: 'DAGGERHEART.General.tabs.adversaries'
+        }
+    };
+
+    async _prepareContext(_options) {
+        const context = await super._prepareContext(_options);
+        context.document = this.actor;
+        context.tabs = this._getTabs(this.constructor.TABS);
+        context.systemFields = this.actor.system.schema.fields;
+        context.isNPC = true;
+
+        return context;
+    }
+
+    _attachPartListeners(partId, htmlElement, options) {
+        super._attachPartListeners(partId, htmlElement, options);
+
+        this._dragDrop.forEach(d => d.bind(htmlElement));
+    }
+
+    _createDragDropHandlers() {
+        return this.options.dragDrop.map(d => {
+            d.callbacks = {
+                drop: this._onDrop.bind(this)
+            };
+            return new foundry.applications.ux.DragDrop.implementation(d);
+        });
+    }
+
+    _getTabs(tabs) {
+        for (const v of Object.values(tabs)) {
+            v.active = this.tabGroups[v.group] ? this.tabGroups[v.group] === v.id : v.active;
+            v.cssClass = v.active ? 'active' : '';
+        }
+
+        return tabs;
+    }
+
+    static async #addAction(_event, _button) {
+        const actionType = await DHBaseItemSheet.selectActionType();
+        if (!actionType) return;
+        try {
+            const cls = actionsTypes[actionType] ?? actionsTypes.attack,
+                action = new cls(
+                    {
+                        _id: foundry.utils.randomID(),
+                        type: actionType,
+                        name: game.i18n.localize(SYSTEM.ACTIONS.actionTypes[actionType].name),
+                        ...cls.getSourceConfig(this.actor)
+                    },
+                    {
+                        parent: this.actor
+                    }
+                );
+            await this.actor.update({ 'system.actions': [...this.actor.system.actions, action] });
+            await new DHActionConfig(this.actor.system.actions[this.actor.system.actions.length - 1]).render({
+                force: true
+            });
+            this.render();
+        } catch (error) {
+            console.log(error);
+        }
+    }
+
+    static async #editAction(event, target) {
+        event.stopPropagation();
+        const actionIndex = target.dataset.index;
+        await new DHActionConfig(this.actor.system.actions[actionIndex]).render({
+            force: true
+        });
+    }
+
+    static async #removeAction(event, target) {
+        event.stopPropagation();
+        const actionIndex = target.dataset.index;
+        await this.actor.update({
+            'system.actions': this.actor.system.actions.filter((_, index) => index !== Number.parseInt(actionIndex))
+        });
+        this.render();
+    }
+
+    static async #addCategory() {
+        await this.actor.update({
+            [`system.potentialAdversaries.${foundry.utils.randomID()}.label`]: game.i18n.localize(
+                'DAGGERHEART.Sheets.Environment.newAdversary'
+            )
+        });
+        this.render();
+    }
+
+    static async #deleteProperty(_, target) {
+        await this.actor.update({ [`${target.dataset.path}.-=${target.id}`]: null });
+        this.render();
+    }
+
+    static async #viewAdversary(_, button) {
+        const adversary = await foundry.utils.fromUuid(button.dataset.adversary);
+        adversary.sheet.render(true);
+    }
+
+    static async #deleteAdversary(event, target) {
+        const adversaryKey = target.dataset.adversary;
+        const path = `system.potentialAdversaries.${target.dataset.potentialAdversary}.adversaries`;
+        const newAdversaries = foundry.utils.getProperty(this.actor, path).filter(x => x.uuid !== adversaryKey);
+        await this.actor.update({ [path]: newAdversaries });
+        this.render();
+    }
+
+    async _onDrop(event) {
+        const data = TextEditor.getDragEventData(event);
+        const item = await fromUuid(data.uuid);
+        if (item.type === 'adversary') {
+            const target = event.target.closest('.category-container');
+            const path = `system.potentialAdversaries.${target.dataset.potentialAdversary}.adversaries`;
+            const current = foundry.utils.getProperty(this.actor, path).map(x => x.uuid);
+            await this.actor.update({
+                [path]: [...current, item.uuid]
+            });
+            this.render();
+        }
+    }
+
+    static async updateForm(event, _, formData) {
+        await this.actor.update(formData.object);
+        this.render();
+    }
+}
diff --git a/module/applications/sheets/daggerheart-sheet.mjs b/module/applications/sheets/daggerheart-sheet.mjs
index 821972d9..aed1dccc 100644
--- a/module/applications/sheets/daggerheart-sheet.mjs
+++ b/module/applications/sheets/daggerheart-sheet.mjs
@@ -60,7 +60,7 @@ export default function DhpApplicationMixin(Base) {
                 //   drop: this._canDragDrop.bind(this)
                 // };
                 d.callbacks = {
-                    // dragstart: this._onDragStart.bind(this),
+                    dragstart: this._onDragStart.bind(this),
                     // dragover: this._onDragOver.bind(this),
                     drop: this._onDrop.bind(this)
                 };
@@ -68,6 +68,7 @@ export default function DhpApplicationMixin(Base) {
             });
         }
 
+        async _onDragStart(event) {}
         _onDrop(event) {}
 
         _getTabs(tabs) {
diff --git a/module/applications/sheets/environment.mjs b/module/applications/sheets/environment.mjs
deleted file mode 100644
index fca33f4d..00000000
--- a/module/applications/sheets/environment.mjs
+++ /dev/null
@@ -1,107 +0,0 @@
-import DaggerheartSheet from './daggerheart-sheet.mjs';
-
-const { ActorSheetV2 } = foundry.applications.sheets;
-export default class DhpEnvironment extends DaggerheartSheet(ActorSheetV2) {
-    static DEFAULT_OPTIONS = {
-        tag: 'form',
-        classes: ['daggerheart', 'sheet', 'actor', 'dh-style', 'environment'],
-        position: {
-            width: 450,
-            height: 1000
-        },
-        actions: {
-            addAdversary: this.addAdversary,
-            addFeature: this.addFeature,
-            deleteProperty: this.deleteProperty,
-            viewAdversary: this.viewAdversary
-        },
-        form: {
-            handler: this._updateForm,
-            submitOnChange: true,
-            closeOnSubmit: false
-        },
-        dragDrop: [{ dragSelector: null, dropSelector: '.adversary-container' }]
-    };
-
-    static PARTS = {
-        header: { template: 'systems/daggerheart/templates/sheets/actors/environment/header.hbs' },
-        tabs: { template: 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs' },
-        main: { template: 'systems/daggerheart/templates/sheets/actors/environment/main.hbs' },
-        information: { template: 'systems/daggerheart/templates/sheets/actors/environment/information.hbs' }
-    };
-
-    static TABS = {
-        main: {
-            active: true,
-            cssClass: '',
-            group: 'primary',
-            id: 'main',
-            icon: null,
-            label: 'DAGGERHEART.Sheets.Environment.Tabs.Main'
-        },
-        information: {
-            active: false,
-            cssClass: '',
-            group: 'primary',
-            id: 'information',
-            icon: null,
-            label: 'DAGGERHEART.Sheets.Environment.Tabs.Information'
-        }
-    };
-
-    async _prepareContext(_options) {
-        const context = await super._prepareContext(_options);
-        context.document = this.document;
-        context.tabs = super._getTabs(this.constructor.TABS);
-        context.getEffectDetails = this.getEffectDetails.bind(this);
-
-        return context;
-    }
-
-    static async _updateForm(event, _, formData) {
-        await this.document.update(formData.object);
-        this.render();
-    }
-
-    getEffectDetails(id) {
-        return {};
-    }
-
-    static async addAdversary() {
-        await this.document.update({
-            [`system.potentialAdversaries.${foundry.utils.randomID()}.label`]: game.i18n.localize(
-                'DAGGERHEART.Sheets.Environment.newAdversary'
-            )
-        });
-        this.render();
-    }
-
-    static async addFeature() {
-        ui.notifications.error('Not Implemented yet. Awaiting datamodel rework');
-    }
-
-    static async deleteProperty(_, target) {
-        await this.document.update({ [`${target.dataset.path}.-=${target.id}`]: null });
-        this.render();
-    }
-
-    static async viewAdversary(_, button) {
-        const adversary = foundry.utils.getProperty(
-            this.document.system.potentialAdversaries,
-            `${button.dataset.potentialAdversary}.adversaries.${button.dataset.adversary}`
-        );
-        adversary.sheet.render(true);
-    }
-
-    async _onDrop(event) {
-        const data = TextEditor.getDragEventData(event);
-        const item = await fromUuid(data.uuid);
-        if (item.type === 'adversary') {
-            const target = event.target.closest('.adversary-container');
-            const path = `system.potentialAdversaries.${target.dataset.potentialAdversary}.adversaries.${item.id}`;
-            await this.document.update({
-                [path]: item.uuid
-            });
-        }
-    }
-}
diff --git a/module/config/actorConfig.mjs b/module/config/actorConfig.mjs
index b3ebf9dc..5b5169ad 100644
--- a/module/config/actorConfig.mjs
+++ b/module/config/actorConfig.mjs
@@ -135,20 +135,20 @@ export const adversaryTypes = {
 
 export const environmentTypes = {
     exploration: {
-        label: 'DAGGERHEART.Environment.Type.Exploration.label',
-        description: 'DAGGERHEART.Environment.Type.Exploration.description'
+        label: 'DAGGERHEART.Environment.Type.exploration.label',
+        description: 'DAGGERHEART.Environment.Type.exploration.description'
     },
     social: {
-        label: 'DAGGERHEART.Environment.Type.Social.label',
-        description: 'DAGGERHEART.Environment.Type.Social.description'
+        label: 'DAGGERHEART.Environment.Type.social.label',
+        description: 'DAGGERHEART.Environment.Type.social.description'
     },
     traversal: {
-        label: 'DAGGERHEART.Environment.Type.Traversal.label',
-        description: 'DAGGERHEART.Environment.Type.Traversal.description'
+        label: 'DAGGERHEART.Environment.Type.traversal.label',
+        description: 'DAGGERHEART.Environment.Type.traversal.description'
     },
     event: {
-        label: 'DAGGERHEART.Environment.Type.Event.label',
-        description: 'DAGGERHEART.Environment.Type.Event.description'
+        label: 'DAGGERHEART.Environment.Type.event.label',
+        description: 'DAGGERHEART.Environment.Type.event.description'
     }
 };
 
diff --git a/module/data/actor/environment.mjs b/module/data/actor/environment.mjs
index 3209dfdc..4b7e0716 100644
--- a/module/data/actor/environment.mjs
+++ b/module/data/actor/environment.mjs
@@ -1,6 +1,8 @@
 import { environmentTypes } from '../../config/actorConfig.mjs';
 import BaseDataActor from './base.mjs';
 import ForeignDocumentUUIDField from '../fields/foreignDocumentUUIDField.mjs';
+import ActionField from '../fields/actionField.mjs';
+import ForeignDocumentUUIDArrayField from '../fields/foreignDocumentUUIDArrayField.mjs';
 
 export default class DhEnvironment extends BaseDataActor {
     static LOCALIZATION_PREFIXES = ['DAGGERHEART.Sheets.Environment'];
@@ -21,15 +23,17 @@ export default class DhEnvironment extends BaseDataActor {
                 initial: SYSTEM.GENERAL.tiers.tier1.id
             }),
             type: new fields.StringField({ choices: environmentTypes }),
-            impulses: new fields.HTMLField(),
+            description: new fields.StringField(),
+            impulses: new fields.StringField(),
             difficulty: new fields.NumberField({ required: true, initial: 11, integer: true }),
             potentialAdversaries: new fields.TypedObjectField(
                 new fields.SchemaField({
                     label: new fields.StringField(),
-                    adversaries: new fields.TypedObjectField(new ForeignDocumentUUIDField({ type: 'Actor' }))
+                    adversaries: new ForeignDocumentUUIDArrayField({ type: 'Actor' })
                 })
-            )
-            /* Features pending datamodel rework */
+            ),
+            actions: new fields.ArrayField(new ActionField()),
+            notes: new fields.HTMLField()
         };
     }
 }
diff --git a/styles/daggerheart.css b/styles/daggerheart.css
index b649213a..062dd5a3 100755
--- a/styles/daggerheart.css
+++ b/styles/daggerheart.css
@@ -4318,39 +4318,6 @@ div.daggerheart.views.multiclass {
 .application.sheet.daggerheart.actor.dh-style.adversary .adversary-header-sheet .name-row input[type='text']:hover {
   outline: 2px solid light-dark(#222, #f3c267);
 }
-.application.sheet.daggerheart.actor.dh-style.adversary .adversary-header-sheet .name-row .level-div {
-  white-space: nowrap;
-  display: flex;
-  justify-content: end;
-}
-.application.sheet.daggerheart.actor.dh-style.adversary .adversary-header-sheet .name-row .level-div .label {
-  display: flex;
-  align-items: center;
-  gap: 4px;
-}
-.application.sheet.daggerheart.actor.dh-style.adversary .adversary-header-sheet .name-row .level-div input {
-  width: 40px;
-  padding: 0;
-  text-align: center;
-}
-.application.sheet.daggerheart.actor.dh-style.adversary .adversary-header-sheet .name-row .level-div .level-button {
-  color: light-dark(#222, #efe6d8);
-  font-size: 18px;
-  line-height: 1;
-  min-height: unset;
-  height: min-content;
-  padding: 4px;
-  font-family: 'Cinzel', serif;
-  margin: 0;
-  font-weight: normal;
-  border-color: light-dark(#18162e, #f3c267);
-  background-color: light-dark(transparent, #0e0d15);
-}
-.application.sheet.daggerheart.actor.dh-style.adversary .adversary-header-sheet .name-row .level-div .level-button:hover {
-  background-image: none;
-  background-color: var(--color-warm-2);
-  filter: drop-shadow(0 0 3px lightgray);
-}
 .application.sheet.daggerheart.actor.dh-style.adversary .adversary-header-sheet .tags {
   display: flex;
   gap: 10px;
@@ -4390,35 +4357,6 @@ div.daggerheart.views.multiclass {
   gap: 8px;
   align-items: center;
 }
-.application.sheet.daggerheart.actor.dh-style.adversary .adversary-header-sheet .character-details {
-  display: flex;
-  justify-content: space-between;
-  padding: 5px 0;
-  margin-bottom: 10px;
-  font-size: 12px;
-  color: light-dark(#18162e, #f3c267);
-}
-.application.sheet.daggerheart.actor.dh-style.adversary .adversary-header-sheet .character-details span {
-  padding: 3px;
-  border-radius: 3px;
-  transition: all 0.3s ease;
-  cursor: pointer;
-}
-.application.sheet.daggerheart.actor.dh-style.adversary .adversary-header-sheet .character-details span:hover {
-  background: light-dark(#18162e40, #f3c26740);
-}
-.application.sheet.daggerheart.actor.dh-style.adversary .adversary-header-sheet .character-details span.dot {
-  background: transparent;
-  cursor: default;
-}
-.application.sheet.daggerheart.actor.dh-style.adversary .adversary-header-sheet .character-row {
-  display: flex;
-  gap: 20px;
-  align-items: center;
-  justify-content: space-between;
-  padding: 0;
-  margin-bottom: 15px;
-}
 .application.sheet.daggerheart.actor.dh-style.adversary .window-content {
   display: grid;
   grid-template-columns: 275px 1fr;
@@ -4731,6 +4669,134 @@ div.daggerheart.views.multiclass {
 .application.sheet.daggerheart.actor.dh-style.adversary .adversary-sidebar-sheet .reaction-section button {
   width: 100%;
 }
+.application.sheet.daggerheart.actor.dh-style.environment .environment-header-sheet {
+  display: flex;
+  flex-direction: column;
+  justify-content: start;
+  text-align: center;
+}
+.application.sheet.daggerheart.actor.dh-style.environment .environment-header-sheet .profile {
+  width: 100%;
+  height: 235px;
+  object-fit: cover;
+  mask-image: linear-gradient(0deg, transparent 0%, black 10%);
+  cursor: pointer;
+}
+.application.sheet.daggerheart.actor.dh-style.environment .environment-header-sheet .item-container {
+  display: flex;
+  align-items: center;
+  position: relative;
+  top: -45px;
+  gap: 20px;
+  padding: 0 20px;
+  margin-bottom: -30px;
+}
+.application.sheet.daggerheart.actor.dh-style.environment .environment-header-sheet .item-container .item-info {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+.application.sheet.daggerheart.actor.dh-style.environment .environment-header-sheet .item-container .item-info .tags {
+  display: flex;
+  gap: 10px;
+  padding-bottom: 0;
+}
+.application.sheet.daggerheart.actor.dh-style.environment .environment-header-sheet .item-container .item-info .tags .tag {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  padding: 3px 5px;
+  font-size: 12px;
+  font: 'Montserrat', sans-serif;
+  background: light-dark(#22222215, #efe6d815);
+  border: 1px solid light-dark(#222, #efe6d8);
+  border-radius: 3px;
+}
+.application.sheet.daggerheart.actor.dh-style.environment .environment-header-sheet .item-container .item-info .tags .label {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  font-size: 12px;
+}
+.application.sheet.daggerheart.actor.dh-style.environment .environment-header-sheet .item-container .status-number {
+  justify-items: center;
+}
+.application.sheet.daggerheart.actor.dh-style.environment .environment-header-sheet .item-container .status-number .status-value {
+  position: relative;
+  display: flex;
+  width: 50px;
+  height: 30px;
+  border: 1px solid light-dark(#18162e, #f3c267);
+  border-bottom: none;
+  border-radius: 6px 6px 0 0;
+  padding: 0 6px;
+  font-size: 1.2rem;
+  align-items: center;
+  justify-content: center;
+  background: light-dark(transparent, #18162e);
+  z-index: 2;
+}
+.application.sheet.daggerheart.actor.dh-style.environment .environment-header-sheet .item-container .status-number .status-value.armor-slots {
+  width: 80px;
+  height: 30px;
+}
+.application.sheet.daggerheart.actor.dh-style.environment .environment-header-sheet .item-container .status-number .status-label {
+  padding: 2px 10px;
+  width: 100%;
+  border-radius: 3px;
+  background: light-dark(#18162e, #f3c267);
+}
+.application.sheet.daggerheart.actor.dh-style.environment .environment-header-sheet .item-container .status-number .status-label h4 {
+  font-weight: bold;
+  text-align: center;
+  line-height: 18px;
+  font-size: 12px;
+  color: light-dark(#efe6d8, #18162e);
+}
+.application.sheet.daggerheart.actor.dh-style.environment .environment-header-sheet .item-container .item-name input[type='text'] {
+  font-size: 32px;
+  height: 42px;
+  text-align: start;
+  transition: all 0.3s ease;
+  outline: 2px solid transparent;
+  border: 1px solid transparent;
+}
+.application.sheet.daggerheart.actor.dh-style.environment .environment-header-sheet .item-container .item-name input[type='text']:hover[type='text'],
+.application.sheet.daggerheart.actor.dh-style.environment .environment-header-sheet .item-container .item-name input[type='text']:focus[type='text'] {
+  box-shadow: none;
+  outline: 2px solid light-dark(#18162e, #f3c267);
+}
+.application.sheet.daggerheart.actor.dh-style.environment .environment-header-sheet .environment-info {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  padding: 10px 20px;
+}
+.application.sheet.daggerheart.actor.dh-style.environment .environment-header-sheet .environment-info .description,
+.application.sheet.daggerheart.actor.dh-style.environment .environment-header-sheet .environment-info .impulses {
+  text-align: start;
+  font-family: 'Montserrat', sans-serif;
+}
+.application.sheet.daggerheart.actor.dh-style.environment .environment-header-sheet .environment-navigation {
+  display: flex;
+  gap: 20px;
+  align-items: center;
+  padding: 0 20px;
+}
+.theme-light .application.sheet.daggerheart.actor.dh-style.environment {
+  background: url('../assets/parchments/dh-parchment-light.png');
+}
+.theme-dark .application.sheet.daggerheart.actor.dh-style.environment {
+  background-image: url('../assets/parchments/dh-parchment-dark.png');
+}
+.application.sheet.daggerheart.actor.dh-style.environment .tab {
+  max-height: 300px;
+  overflow-y: auto;
+  scrollbar-width: thin;
+  scrollbar-color: light-dark(#18162e, #f3c267) transparent;
+}
 .application.daggerheart.dh-style.dialog .window-content .dialog-header {
   width: 100%;
   padding-bottom: 16px;
@@ -4772,6 +4838,12 @@ div.daggerheart.views.multiclass {
 .application.daggerheart.dh-style.dialog .tab.experiences .experience-list .experience-item a {
   text-align: center;
 }
+.application.daggerheart.dh-style.dialog .tab.actions {
+  max-height: 450px;
+  overflow-y: auto;
+  scrollbar-width: thin;
+  scrollbar-color: light-dark(#18162e, #f3c267) transparent;
+}
 .application.daggerheart.dh-style.dialog .tab.actions .add-action-btn {
   width: 100%;
   margin-bottom: 12px;
@@ -4786,6 +4858,12 @@ div.daggerheart.views.multiclass {
   grid-template-columns: 40px 1fr auto;
   align-items: center;
   gap: 5px;
+  border-radius: 3px;
+}
+.application.daggerheart.dh-style.dialog .tab.actions .action-list .action-item img {
+  height: 40px;
+  width: 40px;
+  object-fit: cover;
 }
 .application.daggerheart.dh-style.dialog .tab.actions .action-list .action-item .label {
   font-family: 'Montserrat', sans-serif;
@@ -4819,6 +4897,105 @@ div.daggerheart.views.multiclass {
 .application.daggerheart.dh-style.dialog .tab.actions .action-list .action-item .controls a {
   text-align: center;
 }
+.application.daggerheart.dh-style.dialog.environment-settings .tab.actions {
+  max-height: 450px;
+  overflow-y: auto;
+  scrollbar-width: thin;
+  scrollbar-color: light-dark(#18162e, #f3c267) transparent;
+}
+.application.daggerheart.dh-style.dialog.environment-settings .tab.actions .add-action-btn {
+  width: 100%;
+  margin-bottom: 12px;
+}
+.application.daggerheart.dh-style.dialog.environment-settings .tab.actions .action-list {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+}
+.application.daggerheart.dh-style.dialog.environment-settings .tab.actions .action-list .action-item {
+  display: grid;
+  grid-template-columns: 40px 1fr auto;
+  align-items: center;
+  gap: 5px;
+}
+.application.daggerheart.dh-style.dialog.environment-settings .tab.actions .action-list .action-item img {
+  height: 40px;
+  width: 40px;
+  object-fit: cover;
+  border-radius: 3px;
+}
+.application.daggerheart.dh-style.dialog.environment-settings .tab.actions .action-list .action-item .label {
+  font-family: 'Montserrat', sans-serif;
+}
+.application.daggerheart.dh-style.dialog.environment-settings .tab.actions .action-list .action-item .label .tags {
+  display: flex;
+  gap: 10px;
+}
+.application.daggerheart.dh-style.dialog.environment-settings .tab.actions .action-list .action-item .label .tags .tag {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  padding: 3px 5px;
+  font-size: 12px;
+  background: light-dark(#22222215, #efe6d815);
+  border: 1px solid light-dark(#222, #efe6d8);
+  border-radius: 3px;
+}
+.application.daggerheart.dh-style.dialog.environment-settings .tab.actions .action-list .action-item .label .tags .label {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  font-size: 12px;
+}
+.application.daggerheart.dh-style.dialog.environment-settings .tab.actions .action-list .action-item .controls {
+  display: flex;
+  gap: 5px;
+}
+.application.daggerheart.dh-style.dialog.environment-settings .tab.actions .action-list .action-item .controls a {
+  text-align: center;
+}
+.application.daggerheart.dh-style.dialog .tab.adversaries {
+  max-height: 450px;
+  overflow-y: auto;
+  scrollbar-width: thin;
+  scrollbar-color: light-dark(#18162e, #f3c267) transparent;
+}
+.application.daggerheart.dh-style.dialog .tab.adversaries .add-action-btn {
+  width: 100%;
+  margin-bottom: 12px;
+}
+.application.daggerheart.dh-style.dialog .tab.adversaries .category-container {
+  display: flex;
+  flex-direction: column;
+  align-items: start;
+  gap: 8px;
+}
+.application.daggerheart.dh-style.dialog .tab.adversaries .category-container .category-name {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  width: 100%;
+}
+.application.daggerheart.dh-style.dialog .tab.adversaries .category-container .adversaries-container {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  width: 100%;
+}
+.application.daggerheart.dh-style.dialog .tab.adversaries .adversaries-dragger {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  box-sizing: border-box;
+  width: 100%;
+  height: 40px;
+  border: 1px dashed light-dark(#18162e50, #efe6d850);
+  border-radius: 3px;
+  color: light-dark(#18162e50, #efe6d850);
+  font-family: 'Montserrat', sans-serif;
+}
 .application.sheet.daggerheart.actor.dh-style.companion .profile {
   height: 80px;
   width: 80px;
@@ -5503,6 +5680,12 @@ div.daggerheart.views.multiclass {
   grid-template-columns: 1fr 4fr 1fr;
   cursor: pointer;
 }
+.sheet.daggerheart.dh-style .tab.actions .actions-list .action-item img {
+  height: 40px;
+  width: 40px;
+  object-fit: cover;
+  border-radius: 3px;
+}
 .sheet.daggerheart.dh-style .tab.actions .actions-list .action-item h4 {
   font-family: 'Montserrat', sans-serif;
   font-weight: lighter;
@@ -5724,13 +5907,13 @@ div.daggerheart.views.multiclass {
 .sheet.daggerheart.dh-style.item .tab.features .feature-list .feature-item .feature-line .controls a {
   text-shadow: none;
 }
-.application.sheet.daggerheart.actor.dh-style .inventory-item {
+.application.daggerheart.dh-style .inventory-item {
   display: grid;
   grid-template-columns: 40px 1fr 60px;
   gap: 10px;
   width: 100%;
 }
-.application.sheet.daggerheart.actor.dh-style .inventory-item .item-img {
+.application.daggerheart.dh-style .inventory-item .item-img {
   height: 40px;
   width: 40px;
   border-radius: 3px;
@@ -5738,20 +5921,23 @@ div.daggerheart.views.multiclass {
   cursor: pointer;
   object-fit: cover;
 }
-.application.sheet.daggerheart.actor.dh-style .inventory-item .item-label {
+.application.daggerheart.dh-style .inventory-item .item-img.actor-img {
+  border-radius: 50%;
+}
+.application.daggerheart.dh-style .inventory-item .item-label {
   font-family: 'Montserrat', sans-serif;
   align-self: center;
 }
-.application.sheet.daggerheart.actor.dh-style .inventory-item .item-label .item-name {
+.application.daggerheart.dh-style .inventory-item .item-label .item-name {
   font-size: 14px;
 }
-.application.sheet.daggerheart.actor.dh-style .inventory-item .item-label .item-tags,
-.application.sheet.daggerheart.actor.dh-style .inventory-item .item-label .item-labels {
+.application.daggerheart.dh-style .inventory-item .item-label .item-tags,
+.application.daggerheart.dh-style .inventory-item .item-label .item-labels {
   display: flex;
   gap: 10px;
 }
-.application.sheet.daggerheart.actor.dh-style .inventory-item .item-label .item-tags .tag,
-.application.sheet.daggerheart.actor.dh-style .inventory-item .item-label .item-labels .tag {
+.application.daggerheart.dh-style .inventory-item .item-label .item-tags .tag,
+.application.daggerheart.dh-style .inventory-item .item-label .item-labels .tag {
   display: flex;
   flex-direction: row;
   justify-content: center;
@@ -5762,27 +5948,27 @@ div.daggerheart.views.multiclass {
   border: 1px solid light-dark(#222, #efe6d8);
   border-radius: 3px;
 }
-.application.sheet.daggerheart.actor.dh-style .inventory-item .item-label .item-tags .label,
-.application.sheet.daggerheart.actor.dh-style .inventory-item .item-label .item-labels .label {
+.application.daggerheart.dh-style .inventory-item .item-label .item-tags .label,
+.application.daggerheart.dh-style .inventory-item .item-label .item-labels .label {
   display: flex;
   flex-direction: row;
   justify-content: center;
   align-items: center;
   font-size: 12px;
 }
-.application.sheet.daggerheart.actor.dh-style .inventory-item .controls {
+.application.daggerheart.dh-style .inventory-item .controls {
   display: flex;
   align-items: center;
   justify-content: end;
   gap: 8px;
 }
-.application.sheet.daggerheart.actor.dh-style .inventory-item .controls a {
+.application.daggerheart.dh-style .inventory-item .controls a {
   text-align: center;
 }
-.application.sheet.daggerheart.actor.dh-style .inventory-item .controls a.unequipped {
+.application.daggerheart.dh-style .inventory-item .controls a.unequipped {
   opacity: 0.4;
 }
-.application.sheet.daggerheart.actor.dh-style .card-item {
+.application.daggerheart.dh-style .card-item {
   position: relative;
   height: 120px;
   width: 100px;
@@ -5790,21 +5976,21 @@ div.daggerheart.views.multiclass {
   border-radius: 6px;
   cursor: pointer;
 }
-.application.sheet.daggerheart.actor.dh-style .card-item:hover .card-label {
+.application.daggerheart.dh-style .card-item:hover .card-label {
   padding-top: 15px;
 }
-.application.sheet.daggerheart.actor.dh-style .card-item:hover .card-label .controls {
+.application.daggerheart.dh-style .card-item:hover .card-label .controls {
   opacity: 1;
   visibility: visible;
   transition: all 0.3s ease;
   max-height: 16px;
 }
-.application.sheet.daggerheart.actor.dh-style .card-item .card-img {
+.application.daggerheart.dh-style .card-item .card-img {
   height: 100%;
   width: 100%;
   object-fit: cover;
 }
-.application.sheet.daggerheart.actor.dh-style .card-item .card-label {
+.application.daggerheart.dh-style .card-item .card-label {
   display: flex;
   flex-direction: column;
   height: fit-content;
@@ -5818,7 +6004,7 @@ div.daggerheart.views.multiclass {
   bottom: 0;
   mask-image: linear-gradient(180deg, transparent 0%, black 20%);
 }
-.application.sheet.daggerheart.actor.dh-style .card-item .card-label .card-name {
+.application.daggerheart.dh-style .card-item .card-label .card-name {
   font-family: 'Montserrat', sans-serif;
   font-style: normal;
   font-weight: 400;
@@ -5826,7 +6012,7 @@ div.daggerheart.views.multiclass {
   line-height: 15px;
   color: #efe6d8;
 }
-.application.sheet.daggerheart.actor.dh-style .card-item .card-label .controls {
+.application.daggerheart.dh-style .card-item .card-label .controls {
   display: flex;
   gap: 15px;
   align-items: center;
diff --git a/styles/daggerheart.less b/styles/daggerheart.less
index 9c5ba914..362856ce 100755
--- a/styles/daggerheart.less
+++ b/styles/daggerheart.less
@@ -29,10 +29,17 @@
 @import './less/actors/adversary/sheet.less';
 @import './less/actors/adversary/sidebar.less';
 
+@import './less/actors/environment/header.less';
+@import './less/actors/environment/sheet.less';
+
 @import './less/applications/header.less';
 @import './less/applications/adversary-settings/sheet.less';
 @import './less/applications/adversary-settings/experiences.less';
 @import './less/applications/adversary-settings/actions.less';
+
+@import './less/applications/environment-settings/actions.less';
+@import './less/applications/environment-settings/adversaries.less';
+
 @import './less/actors/companion/sheet.less';
 
 @import './less/actors/adversary.less';
diff --git a/styles/less/actors/adversary/header.less b/styles/less/actors/adversary/header.less
index a7a55f35..4b962466 100644
--- a/styles/less/actors/adversary/header.less
+++ b/styles/less/actors/adversary/header.less
@@ -29,44 +29,6 @@
                     outline: 2px solid light-dark(@dark, @golden);
                 }
             }
-
-            .level-div {
-                white-space: nowrap;
-                display: flex;
-                justify-content: end;
-
-                .label {
-                    display: flex;
-                    align-items: center;
-                    gap: 4px;
-                }
-
-                input {
-                    width: 40px;
-                    padding: 0;
-                    text-align: center;
-                }
-
-                .level-button {
-                    color: light-dark(@dark, @beige);
-                    font-size: 18px;
-                    line-height: 1;
-                    min-height: unset;
-                    height: min-content;
-                    padding: 4px;
-                    font-family: 'Cinzel', serif;
-                    margin: 0;
-                    font-weight: normal;
-                    border-color: light-dark(@dark-blue, @golden);
-                    background-color: light-dark(transparent, @deep-black);
-
-                    &:hover {
-                        background-image: none;
-                        background-color: var(--color-warm-2);
-                        filter: drop-shadow(0 0 3px lightgray);
-                    }
-                }
-            }
         }
 
         .tags {
@@ -114,39 +76,5 @@
             gap: 8px;
             align-items: center;
         }
-
-        .character-details {
-            display: flex;
-            justify-content: space-between;
-            padding: 5px 0;
-            margin-bottom: 10px;
-            font-size: 12px;
-            color: light-dark(@dark-blue, @golden);
-
-            span {
-                padding: 3px;
-                border-radius: 3px;
-                transition: all 0.3s ease;
-                cursor: pointer;
-
-                &:hover {
-                    background: light-dark(@dark-blue-40, @golden-40);
-                }
-
-                &.dot {
-                    background: transparent;
-                    cursor: default;
-                }
-            }
-        }
-
-        .character-row {
-            display: flex;
-            gap: 20px;
-            align-items: center;
-            justify-content: space-between;
-            padding: 0;
-            margin-bottom: 15px;
-        }
     }
 }
diff --git a/styles/less/actors/environment/header.less b/styles/less/actors/environment/header.less
new file mode 100644
index 00000000..fce7943f
--- /dev/null
+++ b/styles/less/actors/environment/header.less
@@ -0,0 +1,140 @@
+@import '../../utils/colors.less';
+@import '../../utils/fonts.less';
+
+.application.sheet.daggerheart.actor.dh-style.environment {
+    .environment-header-sheet {
+        display: flex;
+        flex-direction: column;
+        justify-content: start;
+        text-align: center;
+
+        .profile {
+            width: 100%;
+            height: 235px;
+            object-fit: cover;
+            mask-image: linear-gradient(0deg, transparent 0%, black 10%);
+            cursor: pointer;
+        }
+
+        .item-container {
+            display: flex;
+            align-items: center;
+            position: relative;
+            top: -45px;
+            gap: 20px;
+            padding: 0 20px;
+            margin-bottom: -30px;
+
+            .item-info {
+                display: flex;
+                flex-direction: column;
+                gap: 8px;
+
+                .tags {
+                    display: flex;
+                    gap: 10px;
+                    padding-bottom: 0;
+
+                    .tag {
+                        display: flex;
+                        flex-direction: row;
+                        justify-content: center;
+                        align-items: center;
+                        padding: 3px 5px;
+                        font-size: 12px;
+                        font: @font-body;
+
+                        background: light-dark(@dark-15, @beige-15);
+                        border: 1px solid light-dark(@dark, @beige);
+                        border-radius: 3px;
+                    }
+
+                    .label {
+                        display: flex;
+                        flex-direction: row;
+                        justify-content: center;
+                        align-items: center;
+                        font-size: 12px;
+                    }
+                }
+            }
+
+            .status-number {
+                justify-items: center;
+
+                .status-value {
+                    position: relative;
+                    display: flex;
+                    width: 50px;
+                    height: 30px;
+                    border: 1px solid light-dark(@dark-blue, @golden);
+                    border-bottom: none;
+                    border-radius: 6px 6px 0 0;
+                    padding: 0 6px;
+                    font-size: 1.2rem;
+                    align-items: center;
+                    justify-content: center;
+                    background: light-dark(transparent, @dark-blue);
+                    z-index: 2;
+
+                    &.armor-slots {
+                        width: 80px;
+                        height: 30px;
+                    }
+                }
+
+                .status-label {
+                    padding: 2px 10px;
+                    width: 100%;
+                    border-radius: 3px;
+                    background: light-dark(@dark-blue, @golden);
+
+                    h4 {
+                        font-weight: bold;
+                        text-align: center;
+                        line-height: 18px;
+                        font-size: 12px;
+                        color: light-dark(@beige, @dark-blue);
+                    }
+                }
+            }
+
+            .item-name {
+                input[type='text'] {
+                    font-size: 32px;
+                    height: 42px;
+                    text-align: start;
+                    transition: all 0.3s ease;
+                    outline: 2px solid transparent;
+                    border: 1px solid transparent;
+
+                    &:hover[type='text'],
+                    &:focus[type='text'] {
+                        box-shadow: none;
+                        outline: 2px solid light-dark(@dark-blue, @golden);
+                    }
+                }
+            }
+        }
+
+        .environment-info {
+            display: flex;
+            flex-direction: column;
+            gap: 12px;
+            padding: 10px 20px;
+
+            .description,
+            .impulses {
+                text-align: start;
+                font-family: @font-body;
+            }
+        }
+
+        .environment-navigation {
+            display: flex;
+            gap: 20px;
+            align-items: center;
+            padding: 0 20px;
+        }
+    }
+}
diff --git a/styles/less/actors/environment/sheet.less b/styles/less/actors/environment/sheet.less
new file mode 100644
index 00000000..5e604188
--- /dev/null
+++ b/styles/less/actors/environment/sheet.less
@@ -0,0 +1,18 @@
+@import '../../utils/colors.less';
+@import '../../utils/fonts.less';
+
+.application.sheet.daggerheart.actor.dh-style.environment {
+    .theme-light & {
+        background: url('../assets/parchments/dh-parchment-light.png');
+    }
+    .theme-dark & {
+        background-image: url('../assets/parchments/dh-parchment-dark.png');
+    }
+
+    .tab {
+        max-height: 300px;
+        overflow-y: auto;
+        scrollbar-width: thin;
+        scrollbar-color: light-dark(@dark-blue, @golden) transparent;
+    }
+}
diff --git a/styles/less/applications/adversary-settings/actions.less b/styles/less/applications/adversary-settings/actions.less
index 8bce0ad7..55cf2828 100644
--- a/styles/less/applications/adversary-settings/actions.less
+++ b/styles/less/applications/adversary-settings/actions.less
@@ -3,6 +3,11 @@
 
 .application.daggerheart.dh-style.dialog {
     .tab.actions {
+        max-height: 450px;
+        overflow-y: auto;
+        scrollbar-width: thin;
+        scrollbar-color: light-dark(@dark-blue, @golden) transparent;
+
         .add-action-btn {
             width: 100%;
             margin-bottom: 12px;
@@ -18,6 +23,13 @@
                 grid-template-columns: 40px 1fr auto;
                 align-items: center;
                 gap: 5px;
+                border-radius: 3px;
+
+                img {
+                    height: 40px;
+                    width: 40px;
+                    object-fit: cover;
+                }
 
                 .label {
                     font-family: @font-body;
diff --git a/styles/less/applications/environment-settings/actions.less b/styles/less/applications/environment-settings/actions.less
new file mode 100644
index 00000000..e4886ea9
--- /dev/null
+++ b/styles/less/applications/environment-settings/actions.less
@@ -0,0 +1,74 @@
+@import '../../utils/colors.less';
+@import '../../utils/fonts.less';
+
+.application.daggerheart.dh-style.dialog.environment-settings {
+    .tab.actions {
+        max-height: 450px;
+        overflow-y: auto;
+        scrollbar-width: thin;
+        scrollbar-color: light-dark(@dark-blue, @golden) transparent;
+
+        .add-action-btn {
+            width: 100%;
+            margin-bottom: 12px;
+        }
+
+        .action-list {
+            display: flex;
+            flex-direction: column;
+            gap: 10px;
+
+            .action-item {
+                display: grid;
+                grid-template-columns: 40px 1fr auto;
+                align-items: center;
+                gap: 5px;
+
+                img {
+                    height: 40px;
+                    width: 40px;
+                    object-fit: cover;
+                    border-radius: 3px;
+                }
+
+                .label {
+                    font-family: @font-body;
+
+                    .tags {
+                        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;
+                        }
+
+                        .label {
+                            display: flex;
+                            flex-direction: row;
+                            justify-content: center;
+                            align-items: center;
+                            font-size: 12px;
+                        }
+                    }
+                }
+
+                .controls {
+                    display: flex;
+                    gap: 5px;
+                    a {
+                        text-align: center;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/styles/less/applications/environment-settings/adversaries.less b/styles/less/applications/environment-settings/adversaries.less
new file mode 100644
index 00000000..a60314ff
--- /dev/null
+++ b/styles/less/applications/environment-settings/adversaries.less
@@ -0,0 +1,50 @@
+@import '../../utils/colors.less';
+@import '../../utils/fonts.less';
+
+.application.daggerheart.dh-style.dialog {
+    .tab.adversaries {
+        max-height: 450px;
+        overflow-y: auto;
+        scrollbar-width: thin;
+        scrollbar-color: light-dark(@dark-blue, @golden) transparent;
+
+        .add-action-btn {
+            width: 100%;
+            margin-bottom: 12px;
+        }
+
+        .category-container {
+            display: flex;
+            flex-direction: column;
+            align-items: start;
+            gap: 8px;
+
+            .category-name {
+                display: flex;
+                align-items: center;
+                gap: 10px;
+                width: 100%;
+            }
+
+            .adversaries-container {
+                display: flex;
+                flex-direction: column;
+                gap: 6px;
+                width: 100%;
+            }
+        }
+
+        .adversaries-dragger {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            box-sizing: border-box;
+            width: 100%;
+            height: 40px;
+            border: 1px dashed light-dark(@dark-blue-50, @beige-50);
+            border-radius: 3px;
+            color: light-dark(@dark-blue-50, @beige-50);
+            font-family: @font-body;
+        }
+    }
+}
diff --git a/styles/less/global/inventory-item.less b/styles/less/global/inventory-item.less
index d5b854b7..8d521c82 100644
--- a/styles/less/global/inventory-item.less
+++ b/styles/less/global/inventory-item.less
@@ -1,7 +1,7 @@
 @import '../utils/colors.less';
 @import '../utils/fonts.less';
 
-.application.sheet.daggerheart.actor.dh-style {
+.application.daggerheart.dh-style {
     .inventory-item {
         display: grid;
         grid-template-columns: 40px 1fr 60px;
@@ -15,6 +15,10 @@
             border: none;
             cursor: pointer;
             object-fit: cover;
+
+            &.actor-img {
+                border-radius: 50%;
+            }
         }
 
         .item-label {
diff --git a/styles/less/global/tab-actions.less b/styles/less/global/tab-actions.less
index 7b225d4a..0617016d 100644
--- a/styles/less/global/tab-actions.less
+++ b/styles/less/global/tab-actions.less
@@ -18,6 +18,13 @@
                 grid-template-columns: 1fr 4fr 1fr;
                 cursor: pointer;
 
+                img {
+                    height: 40px;
+                    width: 40px;
+                    object-fit: cover;
+                    border-radius: 3px;
+                }
+
                 h4 {
                     font-family: @font-body;
                     font-weight: lighter;
diff --git a/templates/sheets/actors/adversary/information.hbs b/templates/sheets/actors/adversary/information.hbs
deleted file mode 100644
index 085f200c..00000000
--- a/templates/sheets/actors/adversary/information.hbs
+++ /dev/null
@@ -1,17 +0,0 @@
-<section
-    class='tab {{tabs.information.cssClass}} {{tabs.information.id}}'
-    data-tab='{{tabs.information.id}}'
-    data-group='{{tabs.information.group}}'
->
-    {{!-- <fieldset>
-        <legend>{{localize "DAGGERHEART.Sheets.Adversary.FIELDS.description.label" }}</legend>
-
-        {{formInput systemFields.description value=source.system.description}}
-    </fieldset> --}}
-
-    <fieldset>
-        <legend>{{localize "DAGGERHEART.Sheets.Adversary.FIELDS.motivesAndTactics.label" }}</legend>
-
-        {{formInput systemFields.motivesAndTactics value=source.system.motivesAndTactics}}
-    </fieldset>
-</section>
diff --git a/templates/sheets/actors/adversary/main.hbs b/templates/sheets/actors/adversary/main.hbs
deleted file mode 100644
index 5f172fab..00000000
--- a/templates/sheets/actors/adversary/main.hbs
+++ /dev/null
@@ -1,43 +0,0 @@
-<section
-    class='tab {{tabs.main.cssClass}} {{tabs.main.id}}'
-    data-tab='{{tabs.main.id}}'
-    data-group='{{tabs.main.group}}'
->
-    <div class="adversary-container">
-        <fieldset class="two-columns even">
-            <legend>{{localize "DAGGERHEART.Sheets.Adversary.General"}}</legend>
-
-            
-            <div class="full-width">{{formGroup systemFields.difficulty value=source.system.difficulty}}</div>
-            
-            <fieldset>
-                <legend>{{localize "DAGGERHEART.Sheets.Adversary.HitPoints"}}</legend>
-                <!--
-                {{formGroup systemFields.resources.fields.hitPoints.fields.value value=source.system.resources.hitPoints.value}}
-                {{formGroup systemFields.resources.fields.hitPoints.fields.max value=source.system.resources.hitPoints.max}}
-                -->
-            </fieldset>
-
-            <fieldset>
-                <legend>{{localize "DAGGERHEART.Sheets.Adversary.Stress"}}</legend>
-                <!--
-                {{formGroup systemFields.resources.fields.stress.fields.value value=source.system.resources.stress.value}}
-                {{formGroup systemFields.resources.fields.stress.fields.max value=source.system.resources.stress.max}}
-                -->
-            </fieldset>
-
-            <fieldset>
-                <legend>{{localize "DAGGERHEART.Sheets.Adversary.Experiences"}} <a><i class="fa-solid fa-plus icon-button" data-action="addExperience"></i></a></legend>
-
-                {{#each source.system.experiences}}
-                    <fieldset class="one-column">
-                        <legend>{{this.name}} <a><i class="fa-solid fa-trash icon-button" data-action="removeExperience" data-experience="{{@key}}"></i></a></legend>
-
-                        {{formGroup @root.systemFields.experiences.element.fields.name name=(concat "system.experiences." @key ".name") value=this.name }}
-                        {{formGroup @root.systemFields.experiences.element.fields.value name=(concat "system.experiences." @key ".value") value=this.value }}
-                    </fieldset>
-                {{/each}}
-            </fieldset>
-        </fieldset>
-    </div>
-</section>
diff --git a/templates/sheets/actors/environment/actions.hbs b/templates/sheets/actors/environment/actions.hbs
new file mode 100644
index 00000000..48ee18a7
--- /dev/null
+++ b/templates/sheets/actors/environment/actions.hbs
@@ -0,0 +1,9 @@
+<section
+    class='tab {{tabs.actions.cssClass}} {{tabs.actions.id}}'
+    data-tab='{{tabs.actions.id}}'
+    data-group='{{tabs.actions.group}}'
+>
+    <div class="action-section">
+        {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-fieldset-items.hbs' title=(localize tabs.actions.label) type='action'}}
+    </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 a21f5f64..d7fa9c3a 100644
--- a/templates/sheets/actors/environment/header.hbs
+++ b/templates/sheets/actors/environment/header.hbs
@@ -1,9 +1,49 @@
-<header class='item-card-header'>
+<header class='environment-header-sheet'>
     <img class='profile' src='{{source.img}}' data-action='editImage' data-edit='img' />
-    <div class='item-info'>
-        <h1 class='item-name'><input type='text' name='name' value='{{source.name}}' /></h1>
-        <div class='item-description'>
-            <h3>{{localize 'TYPES.Actor.environment'}}</h3>
+    <div class='item-container'>
+        <div class="item-info">
+            <h1 class='item-name'><input type='text' name='name' value='{{source.name}}' /></h1>
+            <div class="tags">
+                <div class="tag">
+                    <span>
+                        {{localize (concat 'DAGGERHEART.Tiers.' source.system.tier)}}
+                    </span>
+                </div>
+                {{#if source.system.type}}
+                    <div class="tag">
+                        <span>
+                            {{localize (concat 'DAGGERHEART.Environment.Type.' source.system.type '.label')}}
+                        </span>
+                    </div>
+                {{/if}}
+            </div>
+        </div>
+        <div class="status-number">
+            <div class='status-value armor-slots'>
+                {{#if source.system.difficulty}}
+                    <p>{{source.system.difficulty}}</p>
+                {{else}}
+                    <p>-</p>
+                {{/if}}
+            </div>
+            <div class="status-label">
+                <h4>Difficulty</h4>
+            </div>
         </div>
     </div>
+    <line-div></line-div>
+    <div class="environment-info">
+        <div class="description">
+            <i>{{source.system.description}}</i>
+        </div>
+        <div class="impulses">
+            <b>{{localize 'DAGGERHEART.Sheets.Environment.FIELDS.impulses.label'}}: </b>{{{source.system.impulses}}}
+        </div>
+    </div>
+    <div class="environment-navigation">
+        {{> 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs'}}
+        <button data-action="openSettings">
+            <i class="fa-solid fa-wrench"></i>
+        </button>
+    </div>
 </header>
\ No newline at end of file
diff --git a/templates/sheets/actors/environment/information.hbs b/templates/sheets/actors/environment/information.hbs
deleted file mode 100644
index 3b49a933..00000000
--- a/templates/sheets/actors/environment/information.hbs
+++ /dev/null
@@ -1,16 +0,0 @@
-<section
-    class='tab {{tabs.information.cssClass}} {{tabs.information.id}}'
-    data-tab='{{tabs.information.id}}'
-    data-group='{{tabs.information.group}}'
->
-    <fieldset>
-        <legend>{{localize "DAGGERHEART.Sheets.Environment.description"}}</legend>
-        
-        {{formInput systemFields.description value=source.system.description }}
-    </fieldset>
-    <fieldset>
-        <legend>{{localize "DAGGERHEART.Sheets.Environment.impulses"}}</legend>
-        
-        {{formInput systemFields.impulses value=source.system.impulses }}
-    </fieldset>
-</section>
\ No newline at end of file
diff --git a/templates/sheets/actors/environment/main.hbs b/templates/sheets/actors/environment/main.hbs
deleted file mode 100644
index a973cdc9..00000000
--- a/templates/sheets/actors/environment/main.hbs
+++ /dev/null
@@ -1,37 +0,0 @@
-<section
-    class='tab {{tabs.main.cssClass}} {{tabs.main.id}}'
-    data-tab='{{tabs.main.id}}'
-    data-group='{{tabs.main.group}}'
->
-    <fieldset class="two-columns even">
-        <legend>{{localize "DAGGERHEART.Sheets.Environment.general"}}</legend>
-        
-        {{formGroup systemFields.tier value=source.system.tier localize=true }}
-        {{formGroup systemFields.type value=source.system.type localize=true }}
-        {{formGroup systemFields.difficulty value=source.system.difficulty localize=true }}
-    </fieldset>
-
-    <fieldset class="one-column">
-        <legend>{{localize "DAGGERHEART.Sheets.Environment.potentialAdversaries.label"}}<a><i class="fa-solid fa-plus icon-button" data-action="addAdversary"></i></a></legend>
-
-        {{#each source.system.potentialAdversaries}}
-            <fieldset class="potential-adversary-container" data-potential-adversary="{{@key}}">
-                <legend><input name="{{concat "system.potentialAdversaries." id ".label" }}" value="{{this.label}}" /><i class="fa-solid fa-trash" data-action="deleteProperty" data-path="system.potentialAdversaries" id={{@key}}></i></legend>
-                {{#if (eq (length this.adversaries) 0)}}
-                    <div class="adversary-placeholder">{{localize "DAGGERHEART.Sheets.Environment.potentialAdversaries.placeholder"}}</div>
-                {{else}}
-                    <div class="adversaries-container">
-                        {{#each this.adversaries as |adversary id|}}
-                            <div class="adversary-container" data-action="viewAdversary" data-potential-adversary="{{@../key}}" data-adversary="{{id}}">{{adversary.name}}</div>
-                        {{/each}}
-                    </div>
-                {{/if}}
-            </fieldset>
-        {{/each}}
-    </fieldset>
-
-    <fieldset class="one-column">
-        <legend>{{localize "DAGGERHEART.Sheets.Environment.features.label"}}<a><i class="fa-solid fa-plus icon-button" data-action="addFeature"></i></a></legend>
-
-    </fieldset>
-</section>
\ No newline at end of file
diff --git a/templates/sheets/actors/environment/notes.hbs b/templates/sheets/actors/environment/notes.hbs
new file mode 100644
index 00000000..effa7240
--- /dev/null
+++ b/templates/sheets/actors/environment/notes.hbs
@@ -0,0 +1,10 @@
+<section
+    class='tab {{tabs.notes.cssClass}} {{tabs.notes.id}}'
+    data-tab='{{tabs.notes.id}}'
+    data-group='{{tabs.notes.group}}'
+>
+    <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}}
+    </fieldset>
+</section>
\ No newline at end of file
diff --git a/templates/sheets/actors/environment/potentialAdversaries.hbs b/templates/sheets/actors/environment/potentialAdversaries.hbs
new file mode 100644
index 00000000..f39a1adf
--- /dev/null
+++ b/templates/sheets/actors/environment/potentialAdversaries.hbs
@@ -0,0 +1,11 @@
+<section
+    class='tab {{tabs.potentialAdversaries.cssClass}} {{tabs.potentialAdversaries.id}}'
+    data-tab='{{tabs.potentialAdversaries.id}}'
+    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}}
+    </div>
+</section>
\ No newline at end of file
diff --git a/templates/sheets/adversary.hbs b/templates/sheets/adversary.hbs
deleted file mode 100644
index 67230fdf..00000000
--- a/templates/sheets/adversary.hbs
+++ /dev/null
@@ -1,238 +0,0 @@
-<div>
-    <header class="adversary-header-container">
-        <div class="adversary-header flexrow">
-            <img class="flex0" src="{{document.img}}" data-edit="img" data-action="onEditImage" title="{{document.name}}" height="64" width="64"/>
-            <div class="adversary-title">
-                {{#if this.editMode}}
-                    {{formInput fields.name value=source.name rootId=partId placeholder="{{ localize 'Name' }}"}}
-                {{else}}
-                    <div class="title-text">{{this.title}}</div>
-                {{/if}}
-            </div>
-        </div>
-        <i class="fa-solid fa-wrench icon-button secondary {{#if this.editMode}}active{{/if}}" data-action="toggleSlider" style="position: absolute; right: 4px; top: 4px;"></i>
-    </header>
-
-    <section class="sheet-body">
-        {{#if this.editMode}}
-            <div>
-                <h2>{{localize "DAGGERHEART.Sheets.Adversary.Description"}}</h2>
-                <textarea name="system.description">{{source.system.description}}</textarea>
-                <h2 class="motive-container">
-                    <div class="motive-title">
-                        <div>{{localize "DAGGERHEART.Sheets.Adversary.MotivesAndTactics"}}</div>
-                        <i class="fa-solid fa-plus" data-action="addMotive"></i>
-                    </div>
-                </h2>
-                <div class="ability-choices">
-                    {{#each source.system.motivesAndTactics as |motive index|}}
-                        <div class="ability-chip">
-                            <input type="text" name="system.motivesAndTactics.{{index}}" value="{{motive}}" />
-                            <button><i data-action="removeMotive" data-motive="{{index}}" class="fa-solid fa-x"></i></button>
-                        </div>
-                    {{/each}}
-                </div>
-            </div>
-            <div class="adversary-content-container">
-                <div class="adversary-statistics-container">
-                    <div class="form-group">
-                        <label>{{localize "DAGGERHEART.Sheets.Adversary.Tier"}}</label>
-                        <div class="form-fields">
-                            <select name="system.tier">
-                                {{selectOptions config.GENERAL.tiers selected=source.system.tier labelAttr="key"}}
-                            </select>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label>{{localize "DAGGERHEART.Sheets.Adversary.Type"}}</label>
-                        <div class="form-fields">
-                            <select name="system.type">
-                                {{selectOptions config.ACTOR.adversaryTypes selected=source.system.type labelAttr="name" localize=true}}
-                            </select>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label>{{localize "DAGGERHEART.Sheets.Adversary.Attack.Modifier"}}</label>
-                        <div class="form-fields">
-                            <input type="text" name="system.attackModifier" value="{{source.system.attackModifier}}" data-dtype="Number" />
-                        </div>
-                    </div>
-                    <div class="attack-container">
-                        <h2>{{localize "DAGGERHEART.Sheets.Adversary.Attack.Title"}}</h2>
-                        <div class="form-group">
-                            <label>{{localize "DAGGERHEART.Sheets.Adversary.Attack.Name"}}</label>
-                            <div class="form-fields">
-                                <input type="text" name="system.attack.name" value="{{source.system.attack.name}}" />
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label>{{localize "DAGGERHEART.Sheets.Adversary.Attack.Range"}}</label>
-                            <div class="form-fields">
-                                <select name="system.attack.range">
-                                    {{selectOptions config.GENERAL.range selected=source.system.attack.range labelAttr="name" localize=true}}
-                                </select>
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label>{{localize "DAGGERHEART.Sheets.Adversary.Attack.Damage.Title"}}</label>
-                            <div class="form-fields">
-                                <label>{{localize "DAGGERHEART.Sheets.Adversary.Attack.Damage.Value"}}</label>
-                                <input type="text" name="system.attack.damage.value" value="{{source.system.attack.damage.value}}" />
-                                <label>{{localize "DAGGERHEART.Sheets.Adversary.Attack.Damage.Type"}}</label>
-                                <select name="system.attack.damage.type">
-                                    {{selectOptions config.GENERAL.damageTypes selected=source.system.attack.damage.type labelAttr="name" localize=true}}
-                                </select>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label>{{localize "DAGGERHEART.Sheets.Adversary.Difficulty"}}</label>
-                        <div class="form-fields">
-                            <input type="text" name="system.difficulty" value="{{source.system.difficulty}}" data-dtype="Number" />
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label>{{localize "DAGGERHEART.Sheets.Adversary.DamageThresholds.Title"}}</label>
-                        <div class="form-fields adversary-damage-threshold-container">
-                            <label>{{localize "DAGGERHEART.Sheets.Adversary.DamageThresholds.Major"}}</label>
-                            <input type="text" name="system.damageThresholds.major" value="{{source.system.damageThresholds.major}}" data-dtype="Number" />
-                            <label>{{localize "DAGGERHEART.Sheets.Adversary.DamageThresholds.Severe"}}</label>
-                            <input type="text" name="system.damageThresholds.severe" value="{{source.system.damageThresholds.severe}}" data-dtype="Number" />
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label>{{localize "DAGGERHEART.Sheets.Adversary.HP"}}</label>
-                        <div class="form-fields">
-                            <input type="text" name="system.resources.hitPoints.max" value="{{source.system.resources.hitPoints.max}}" data-dtype="Number" />
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label>{{localize "DAGGERHEART.Sheets.Adversary.Stress"}}</label>
-                        <div class="form-fields">
-                            <input type="text" name="system.resources.stress.max" value="{{source.system.resources.stress.max}}" data-dtype="Number" />
-                        </div>
-                    </div>
-                    <h2 class="experience-container">
-                        <div class="flex-centered">
-                            <div>{{localize "DAGGERHEART.Sheets.Adversary.Experiences"}}</div>
-                            <i class="fa-solid fa-plus" data-action="addExperience"></i>
-                        </div>
-                    </h2>
-                    {{#each source.system.experiences as |experience index|}}
-                        <div class="experience-chip">
-                            <input class="experience.value" type="text" name="system.experiences.{{index}}.name" value="{{experience.name}}" />
-                            <input class="experience-value" type="text" name="system.experiences.{{index}}.value" value="{{experience.value}}" data-dtype="Number" />
-                            <button class="experience-button" data-action="removeExperience" data-experience="{{experience.id}}"><i class="fa-solid fa-x"></i></button>
-                        </div>
-                    {{/each}}
-                </div>
-                <div class="adversary-moves-container">
-                    <h2 class="moves-edit-container">{{localize "DAGGERHEART.Sheets.Adversary.Features"}} <i class="fa-solid fa-plus" data-action="addMove"></i></h2>
-                    {{#each this.data.features as |feature key|}}
-                        <div class="chip-container">
-                            <div class="chip-inner-container">
-                                <img src="{{feature.img}}" />
-                                <div class="move-title">{{feature.name}}</div>
-                            </div>
-                            <div class="chip-inner-container">
-                                <button data-action="viewMove" data-move={{feature.uuid}}><i class="fa-solid fa-fw fa-search"></i></button>
-                                <button data-action="removeMove" data-move={{feature.uuid}}><i class="fa-solid fa-trash"></i></button>
-                            </div>
-                        </div>
-                    {{/each}}
-                </div>
-            </div>
-        {{else}}
-            <div class="motive-container">
-                <div class="motive-title">
-                    <span class="motive-title-value"><strong>{{localize "DAGGERHEART.Sheets.Adversary.Description"}}:</strong> {{this.data.description}}</span>
-                </div>
-                <div class="motive-title">
-                    <span class="motive-title-value"><strong>{{localize "DAGGERHEART.Sheets.Adversary.MotivesAndTactics"}}:</strong> {{this.data.motivesAndTactics}}</span>
-                </div>
-            </div>
-            <div class="adversary-content-container">
-                <div class="adversary-statistics-container">
-                    <div class="statistic-section">
-                        <div class="statistic-row">
-                            <label class="statistic-title">{{localize "DAGGERHEART.Sheets.Adversary.Tier"}}:</label>
-                            <span class="statistic-value">{{this.data.tier}}</span>
-                        </div>
-                        <div class="statistic-row">
-                            <label class="statistic-title">{{localize "DAGGERHEART.Sheets.Adversary.Type"}}:</label>
-                            <span class="statistic-value">{{this.data.type}}</span>
-                        </div>
-                    </div>
-                    <div class="statistic-section">
-                        <div class="statistic-row">
-                            <label class="statistic-title">{{localize "DAGGERHEART.Sheets.Adversary.Difficulty"}}:</label>
-                            <span class="statistic-value">{{this.data.difficulty}}</span>
-                        </div>
-                        <div class="statistic-row">
-                            <label class="statistic-title">{{localize "DAGGERHEART.Sheets.Adversary.Reaction"}}</label>
-                            <img class="adversary-roll" data-action="reactionRoll" src="icons/svg/d20-grey.svg" />
-                        </div>
-                        <div class="statistic-row">
-                            <label class="statistic-title">{{localize "DAGGERHEART.Sheets.Adversary.Attack.Modifier"}}:</label>
-                            <span class="statistic-value">+{{this.data.attack.attackModifier}}</span>
-                            <img class="adversary-roll" data-action="attackRoll" data-value="{{this.data.attack.attackModifier}}" data-name="{{this.data.attack.name}}" data-damage="{{this.data.attack.damage.value}}" data-damage-type="{{this.data.attack.damage.type}}" src="icons/svg/d20-grey.svg" />
-                        </div>
-                        <div class="statistic-row">
-                            <label class="statistic-title">{{localize this.data.attack.name}}</label>
-                            <span class="statistic-value">{{this.data.attack.range}} | {{this.data.attack.damage.value}} {{this.data.attack.damage.typeName}}</span>
-                        </div>
-                    </div>
-                    <div class="statistic-section">
-                        <div class="statistic-row">
-                            <label class="statistic-title">{{localize "DAGGERHEART.Sheets.PC.Health.Major"}}</label>
-                            <span class="statistic-value">{{this.data.damageThresholds.major}}</span>
-                            <div class="vertical-separator" style="height: 16px; margin: 0 4px;"></div>
-                            <label class="statistic-title">{{localize "DAGGERHEART.Sheets.PC.Health.Severe"}}</label>
-                            <span class="statistic-value">{{this.data.damageThresholds.severe}}</span>
-                        </div>
-                        <div class="statistic-resource-container">
-                            <label class="statistic-title">{{localize "DAGGERHEART.Sheets.Adversary.HP"}}</label>
-                            <div class="statistic-resource-inner-container">
-                                {{#times this.data.hp.max}}
-                                    <input class="statistic-resource-input" type="checkbox" data-action="toggleHP" data-index="{{this}}" {{checked (gt ../data.hp.value this)}} />
-                                {{/times}}
-                            </div>
-                        </div>
-                        <div class="statistic-resource-container">
-                            <label class="statistic-title">{{localize "DAGGERHEART.Sheets.Adversary.Stress"}}</label>
-                            <div class="statistic-resource-inner-container">
-                                {{#times this.data.stress.max}}
-                                    <input class="statistic-resource-input" type="checkbox" data-action="toggleStress" data-index="{{this}}" {{checked (gt ../data.stress.value this)}} />
-                                {{/times}}
-                            </div>
-                        </div>
-                    </div>
-                    <div class="statistic-section">
-                        <label class="statistic-title">{{localize "DAGGERHEART.Sheets.Adversary.Experience"}}</label>
-                        {{#each source.system.experiences as |experience index|}}
-                            <div class="experience-row">
-                                <span>{{experience.name}}</span>
-                                &nbsp;
-                                <span>{{#if (gte experience.value 0)}}+{{else}}-{{/if}}{{experience.value}}</span>
-                            </div>
-                        {{/each}}
-                    </div>
-                    {{!-- <div class="statistic-resource-container">
-                        <label class="statistic-title">{{localize "HP:"}}</label>
-                        <span class="statistic-value">{{this.data.hp.max}}</span>
-                    </div> --}}
-                </div>
-                <div class="adversary-moves-container">
-                    <div class="moves-title">{{localize "DAGGERHEART.Sheets.Adversary.Features"}}</div>
-                    {{#each this.data.features as |feature index|}}
-                        <div class="move-container">
-                            <label class="moves-name">{{feature.name}}</label>
-                            <div class="move-description">{{{feature.system.description}}}</div>
-                        </div>
-                    {{/each}}
-                </div>
-            </div>
-
-        {{/if}}
-    </section>
-</div> 
\ No newline at end of file
diff --git a/templates/sheets/applications/environment-settings/actions.hbs b/templates/sheets/applications/environment-settings/actions.hbs
new file mode 100644
index 00000000..73594da2
--- /dev/null
+++ b/templates/sheets/applications/environment-settings/actions.hbs
@@ -0,0 +1,34 @@
+<section
+    class='tab {{tabs.actions.cssClass}} {{tabs.actions.id}}'
+    data-tab='{{tabs.actions.id}}'
+    data-group='{{tabs.actions.group}}'
+>
+    <button class="add-action-btn" data-action="addAction">
+        New Action
+    </button>
+    <fieldset>
+        <legend>{{localize tabs.actions.label}}</legend>
+        <ul class="action-list">
+            {{#each document.system.actions as |action index|}}
+                <li class="action-item">
+                    <img src="{{action.img}}" alt="">
+                    <div class="label">
+                        <span>{{action.name}}</span>
+                        <div class="tags">
+                            <div class="tag">
+                                {{localize (concat 'DAGGERHEART.Actions.Types.' action.type '.name')}}
+                            </div>
+                            <div class="tag">
+                                {{localize (concat 'DAGGERHEART.ActionType.' action.actionType)}}
+                            </div>
+                        </div>
+                    </div>
+                    <div class="controls">
+                        <a data-action="editAction" data-index="{{index}}" data-tooltip="{{localize 'DAGGERHEART.Tooltip.edit'}}"><i class="fa-solid fa-pen-to-square"></i></a>
+                        <a data-action="removeAction" data-index="{{index}}" data-tooltip="{{localize 'DAGGERHEART.Tooltip.delete'}}"><i class="fa-solid fa-trash"></i></a>
+                    </div>
+                </li>
+            {{/each}}
+        </ul>
+    </fieldset>
+</section>
\ No newline at end of file
diff --git a/templates/sheets/applications/environment-settings/adversaries.hbs b/templates/sheets/applications/environment-settings/adversaries.hbs
new file mode 100644
index 00000000..0abe45d1
--- /dev/null
+++ b/templates/sheets/applications/environment-settings/adversaries.hbs
@@ -0,0 +1,28 @@
+<section
+    class='tab {{tabs.adversaries.cssClass}} {{tabs.adversaries.id}}'
+    data-tab='{{tabs.adversaries.id}}'
+    data-group='{{tabs.adversaries.group}}'
+>    
+    <button class="add-action-btn" data-action="addCategory">
+        New Category
+    </button>
+    {{#each document.system.potentialAdversaries}}
+        <fieldset class="category-container" data-potential-adversary="{{@key}}">
+            <legend>{{this.label}}</legend>
+            <div class="category-name">
+                <input type="text" name="{{concat "system.potentialAdversaries." @key ".label" }}" value="{{this.label}}" />
+                <a><i class="fa-solid fa-trash" data-action="deleteProperty" data-path="system.potentialAdversaries" id={{@key}} data-tooltip='{{localize "DAGGERHEART.Tooltip.delete"}}'></i></a>
+            </div>
+            <div class="adversaries-container">
+                {{#each this.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}}
+</section>
\ No newline at end of file
diff --git a/templates/sheets/applications/environment-settings/details.hbs b/templates/sheets/applications/environment-settings/details.hbs
new file mode 100644
index 00000000..f6a9518b
--- /dev/null
+++ b/templates/sheets/applications/environment-settings/details.hbs
@@ -0,0 +1,16 @@
+<section
+    class='tab {{tabs.details.cssClass}} {{tabs.details.id}}'
+    data-tab='{{tabs.details.id}}'
+    data-group='{{tabs.details.group}}'
+>
+    <fieldset class="one-column">
+        <legend>{{localize 'DAGGERHEART.General.basics'}}</legend>
+        <div class="nest-inputs">
+            {{formGroup systemFields.tier value=document.system.tier localize=true}}
+            {{formGroup systemFields.type value=document.system.type localize=true}}
+            {{formGroup systemFields.difficulty value=document.system.difficulty localize=true}}
+        </div>
+        {{formField systemFields.description value=document.system.description label=(localize "DAGGERHEART.Sheets.Environment.FIELDS.description.label")}}
+        {{formField systemFields.impulses value=document.system.impulses label=(localize "DAGGERHEART.Sheets.Environment.FIELDS.impulses.label")}}
+    </fieldset>
+</section>
\ No newline at end of file
diff --git a/templates/sheets/applications/environment-settings/header.hbs b/templates/sheets/applications/environment-settings/header.hbs
new file mode 100644
index 00000000..0978f2c3
--- /dev/null
+++ b/templates/sheets/applications/environment-settings/header.hbs
@@ -0,0 +1,3 @@
+<header class="dialog-header">
+    <h1>{{document.name}}</h1>
+</header>
\ No newline at end of file
diff --git a/templates/sheets/character/character.hbs b/templates/sheets/character/character.hbs
deleted file mode 100644
index 28b80cc7..00000000
--- a/templates/sheets/character/character.hbs
+++ /dev/null
@@ -1,151 +0,0 @@
-<div class="old-sheet">
-    <header>
-        <div class="pc-sheet-header">
-            <div class="class-info">
-                    <div class="flexrow">
-                        {{#if document.system.class.value}}
-                            <div class="flexcol">
-                                <h2 class="class-title flex0" data-action="viewObject" data-value="{{document.system.class.value.uuid}}" data-tab="guide">
-                                    <img class="domain-image" src="{{domains.first}}" />
-                                    <span>{{document.system.class.value.name}}</span>
-                                    <img class="domain-image" src="{{domains.second}}" />
-                                </h2>
-                                <span class="domain-title flex0">
-                                    <span>{{document.system.class.value.system.domains.[0]}}</span> 
-                                    <span>and</span>
-                                    <span>{{document.system.class.value.system.domains.[1]}}</span>
-                            </div>
-                        {{else}}
-                            <div class="flexcol">
-                                <h2 class="class-add-container class-title">Class <button data-action="selectClass"><i class="fa-solid fa-plus"></i></button></h2>
-                            </div>
-                        {{/if}}
-                    </div>
-            </div>
-            <div class="general-info">
-                <div class="flexrow">
-                    <div class="flexcol">
-                        <div class="flexrow">
-                            <div class="flexrow">
-                                <div class="general-input">
-                                    <span class="general-title">{{localize "DAGGERHEART.Sheets.PC.Name"}}</span>
-                                    <input name="name" value="{{document.name}}" type="text" style="padding-left: 50px;" />
-                                </div>
-                                <div class="general-input">
-                                    <span class="general-title">{{localize "DAGGERHEART.Sheets.PC.Pronouns"}}</span>
-                                    <input name="system.pronouns" value="{{document.system.pronouns}}" type="text" style="padding-left: 84px;" />
-                                </div>
-                                <div class="rest-container">
-                                    <button data-action="takeShortRest" title="{{localize "DAGGERHEART.Sheets.PC.ShortRest"}}"><i class="fa-solid fa-chair"></i></button>
-                                    <button data-action="takeLongRest" title="{{localize "DAGGERHEART.Sheets.PC.LongRest"}}"><i class="fa-solid fa-bed"></i></button>
-                                </div>
-                            </div>
-                            <div class="level-container {{#if document.system.levelData.canLevelUp}}levelup{{/if}}" style="width: 30px; height: 30px;">
-                                <div class="level-value-container">
-                                    <input class="level-value {{#if document.system.levelData.canLevelUp}}levelup{{/if}}" value="{{document.system.levelData.level.changed}}" type="text" data-dtype="Number" />
-                                    {{#if document.system.levelData.canLevelUp}}<div class="levelup-marker">*</div>{{/if}}
-                                </div>
-                                <img style="width: 30px; height: 30px;" src="systems/daggerheart/assets/AttributeShield.svg" />
-                                <div data-action="levelup" class="level-title {{#if document.system.levelData.canLevelUp}}levelup{{/if}}">{{localize "DAGGERHEART.Sheets.PC.Level"}}</div>
-                            </div>
-                        </div>
-                        <div class="flexrow">
-                            {{#objectSelector title="Heritage" ids=(join document.system.community.uuid document.system.ancestry.uuid) values=(join document.system.community.name document.system.ancestry.name) titleFontSize=14 style="min-width: 272px;"}}
-                                <button data-action="selectCommunity" class="option-select deeper"><i class="fa-solid fa-house-chimney"></i></button>
-                                <button data-action="selectAncestry" class="option-select"><i class="fa-solid fa-user-large"></i></button>
-                            {{/objectSelector}}
-                            {{#objectSelector title="Subclass" ids=(join document.system.class.subclass.uuid) values=(join document.system.class.subclass.name) titleFontSize=14}}
-                                <button data-action="selectSubclass" class="option-select" {{#if (not ../document.system.class.value)}}disabled{{/if}}><i class="fa-solid fa-fw fa-search"></i></button>
-                            {{/objectSelector}}
-                        </div>
-                    </div>
-                </div>
-                <nav class="sheet-tabs tabs">
-                    {{#each tabs.primary as |tab|}}
-                        <a class="{{tab.cssClass}}" data-action="tab" data-group="{{tab.group}}" data-tab="{{tab.id}}">
-                            <i class="{{tab.icon}}"></i>
-                            <label>{{localize tab.label}}</label>
-                        </a>
-                    {{/each}}
-                </nav>
-            </div>
-        </div>
-    </header>
-    <section class="sheet-body flexcol">
-        <div class="tab features {{this.tabs.primary.features.cssClass}}" data-group="primary" data-tab="features">
-            <div class="tab-container">
-                <div class="flexcol tab-inner-container">
-                    <div class="feature-sheet-body flexrow">
-                        <div class="body-section flex2">
-                            {{> "systems/daggerheart/templates/sheets/parts/defense.hbs" }}
-                            {{> "systems/daggerheart/templates/sheets/parts/health.hbs" }}
-                            {{> "systems/daggerheart/templates/sheets/parts/hope.hbs" }}
-                            {{> "systems/daggerheart/templates/sheets/parts/gold.hbs" }}
-                            {{> "systems/daggerheart/templates/sheets/parts/features.hbs" }}
-                        </div>
-                        <div class="body-section flex3">
-                            {{> "systems/daggerheart/templates/sheets/parts/attributes.hbs" }}
-                            {{> "systems/daggerheart/templates/sheets/parts/weapons.hbs" primaryWeapon=document.system.primaryWeapon secondaryWeapon=document.system.secondaryWeapon weaponBurden=document.system.getWeaponBurden proficiency=document.system.proficiency }}
-                            {{> "systems/daggerheart/templates/sheets/parts/armor.hbs" armor=document.system.armor }}
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="tab domain-card-tab {{this.tabs.primary.loadout.cssClass}}" data-group="primary" data-tab="loadout">
-            {{> "systems/daggerheart/templates/sheets/character/sections/loadout.hbs" abilities=this.abilities actor=this.document config=this.config  }}
-        </div>
-        <div class="tab {{this.tabs.primary.inventory.cssClass}}" data-group="primary" data-tab="inventory">
-            {{> "systems/daggerheart/templates/sheets/character/sections/inventory.hbs" inventory=this.inventory }}
-        </div>
-        <div class="tab {{this.tabs.primary.story.cssClass}}" data-group="primary" data-tab="story">
-            <div class="flexcol" style="height: 100%;">
-                <div class="story-container flexrow">
-                    <fieldset class="story-fieldset">
-                        <legend class="story-legend">{{localize "DAGGERHEART.Sheets.PC.Story.BackgroundTitle"}}</legend>
-
-                        {{editor document.system.story.background target="system.story.background" button=true }}
-                    </fieldset>
-                    <fieldset class="story-fieldset">
-                        <legend class="story-legend">{{localize "DAGGERHEART.Sheets.PC.Story.AppearanceTitle"}}</legend>
-
-                        {{editor document.system.story.appearance target="system.story.appearance" button=true }}
-                    </fieldset>
-                </div>
-                <div class="story-container flexrow">
-                    <fieldset class="story-fieldset">
-                        <legend class="story-legend">{{localize "DAGGERHEART.Sheets.PC.Story.ConnectionsTitle"}}</legend>
-
-                        {{editor document.system.story.connections target="system.story.connections" button=true }}
-                    </fieldset>
-                    <fieldset class="story-fieldset scars-container">
-                        <legend class="story-legend">
-                            {{localize "DAGGERHEART.Sheets.PC.Story.Scars.Title"}} 
-                            <i data-action="addScar" class="fa-solid fa-plus icon-button {{#if (eq document.system.story.scars.length 5)}}disabled{{/if}}"></i>
-                        </legend>
-
-                        <div class="ability-choices">
-                            {{#each document.system.story.scars as |scar index|}}
-                                <div class="ability-chip {{#if (eq key ../selectedScar)}}selected{{/if}}" data-action="selectScar" data-value="{{index}}">
-                                    <input type="text" name="system.story.scars.{{index}}.name" value="{{scar.name}}" />
-                                    <button><i data-action="deleteScar" data-scar="{{index}}" class="fa-solid fa-x"></i></button>
-                                </div>
-                            {{/each}}
-                        </div>
-                        {{#with (lookup document.system.story.scars this.selectedScar)}}
-                            {{#if this}}
-                                    <div class="editor-form-group">
-                                        <label>{{this.name}} - {{localize "Description"}}</label>
-                                        {{editor this.description target=(concat "system.story.scars." ../selectedScar ".description") button=true}}
-                                    </div>
-                            {{/if}}
-                        {{/with}}
-                    </fieldset>
-                </div>
-            </div>
-        </div>
-    </section>
-    <footer>
-
-    </footer>
-</div>
\ No newline at end of file
diff --git a/templates/sheets/character/parts/advancementCard.hbs b/templates/sheets/character/parts/advancementCard.hbs
deleted file mode 100644
index 89e7c145..00000000
--- a/templates/sheets/character/parts/advancementCard.hbs
+++ /dev/null
@@ -1,27 +0,0 @@
-<div class="abilities-card">
-    <div class="abilities-card-image-container">
-        <img class="abilities-card-image" src="{{card.img}}" />
-        <div class="abilities-card-level">
-            {{#each card.domains}}
-                <img src="{{this}}" />
-            {{/each}}
-        </div>
-        <div class="abilities-card-type">
-            <div class="abilities-card-type-text">{{card.className}}</div>
-        </div>  
-    </div>
-    <div class="abilities-text-container">
-        <div class="abilities-card-title">{{card.subclassName}}</div>
-        <div class="abilities-card-sub-title">{{card.subtitle}}</div>
-        {{#if card.spellcast}}<div class="abilities-card-spellcast"><span class="title">Spellcast: </span>&nbsp;<span>{{localize card.spellcast}}</span></div>{{/if}}
-        <div class="abilities-card-description abilities-card-effect" data-action="useAdvancementCard" data-multiclass="{{card.multiclass}}" data-key="{{card.type}}">{{{card.description}}}</div>
-        <div class="abilities-card-abilities">
-            {{#each card.abilities as |ability key|}}
-                <div class="abilities-card-ability" data-action="useAdvancementAbility" data-id="{{ability.uuid}}" data-key="{{key}}">
-                    <span class="abilities-text"><strong>{{ability.name}}</strong></span>
-                    {{{ability.system.description}}}
-                </div>
-            {{/each}}
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/templates/sheets/character/parts/heritageCard.hbs b/templates/sheets/character/parts/heritageCard.hbs
deleted file mode 100644
index 40401ac8..00000000
--- a/templates/sheets/character/parts/heritageCard.hbs
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="abilities-card">
-    <div class="abilities-card-image-container">
-        <img class="abilities-card-image" src="{{card.img}}" />
-        <div class="abilities-card-type"><div class="abilities-card-type-text">{{card.system.type}}</div></div>
-    </div>
-    <div class="abilities-text-container">
-        <div class="abilities-card-title">{{card.name}}</div>
-        <div class="abilities-card-description">{{{card.system.description}}}</div>
-        <div class="abilities-card-abilities">
-            {{#each card.system.abilities as |ability key|}}
-                <div class="abilities-card-ability" data-action="useAbility" data-feature="{{ability.uuid}}" data-type="{{ability.system.type}}">
-                    <span class="abilities-text"><strong>{{ability.name}}</strong></span>
-                    {{{ability.system.description}}}
-                </div>
-            {{/each}}
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/templates/sheets/character/sections/inventory.hbs b/templates/sheets/character/sections/inventory.hbs
deleted file mode 100644
index f56138dc..00000000
--- a/templates/sheets/character/sections/inventory.hbs
+++ /dev/null
@@ -1,35 +0,0 @@
-<div class="inventory-container">
-    {{#each this.inventory as |section key|}}
-        <ol class="inventory-item-list inventory-item-header">
-            <li class="item inventory-title-row-container">
-                <div class="inventory-title-row">
-                    <div class="inventory-item-title-container">{{section.titles.name}}</div>
-                    <div class="inventory-item-quantity title">{{section.titles.quantity}}</div>
-                </div>
-            </li>
-        </ol>
-        <ol class="item-list inventory-item-list">
-            {{#each this.items as |item|}}
-                <li class="item inventory-item">
-                    <div class="inventory-row" data-item-id="{{item.uuid}}">
-                        <div class="inventory-item-title-container">
-                            <div data-action="useItem" data-value="{{item.uuid}}" class="inventory-item-title">
-                                <img src="{{item.img}}" />
-                                {{item.name}}
-                            </div>
-                        </div>
-                        <div class="flexrow">
-                            <button data-action="toggleEquipItem" id="{{item.id}}">{{localize "Equip"}}</button>
-                        </div>
-                        <div class="inventory-item-quantity spaced">
-                            <i data-action="itemQuantityDecrease" class="fa-solid fa-chevron-left icon-button {{#if (lte item.system.quantity 1)}}disabled{{/if}}"></i>
-                            <input type="text" data-item="system.quantity" value="{{item.system.quantity}}" data-dtype="Number" />
-                            <i data-action="itemQuantityIncrease" class="fa-solid fa-chevron-right icon-button"></i>
-                        </div>
-                        <i data-action="deleteItem" class="fas fa-trash icon-button secondary row-icon"></i>
-                    </div>
-                </li>
-            {{/each}}
-        </ol>
-    {{/each}}
-</div>
\ No newline at end of file
diff --git a/templates/sheets/character/sections/loadout.hbs b/templates/sheets/character/sections/loadout.hbs
deleted file mode 100644
index 4feeebe8..00000000
--- a/templates/sheets/character/sections/loadout.hbs
+++ /dev/null
@@ -1,137 +0,0 @@
-<div class="domain-card-body">
-    <nav class="sheet-tabs tabs">
-        {{#each tabs.secondary as |tab|}}
-            <a class="item {{tab.cssClass}}" data-action="tab" data-group="{{tab.group}}" data-tab="{{tab.id}}">
-                <i class="{{tab.icon}}"></i>
-                <label>{{localize tab.label}}</label>
-            </a>
-        {{/each}}
-    </nav>
-    <section class="loadout-body flexcol">
-        <div class="tab" data-group="secondary" data-tab="foundation">
-            <div class="heritage-container">
-                <div class="card-row">
-                    <div class="heritage-card {{#if (not abilities.foundation.ancestry)}}outlined{{/if}}">
-                        {{#if abilities.foundation.ancestry}}
-                            {{> "systems/daggerheart/templates/sheets/character/parts/heritageCard.hbs" card=abilities.foundation.ancestry }}
-                        {{else}}
-                            <div class="empty-ability-container">
-                                <div class="empty-ability-inner-container">
-                                    <div>{{localize "DAGGERHEART.Sheets.PC.Heritage.EmptyAncestry"}}</div>
-                                    <div>{{localize "DAGGERHEART.Sheets.PC.Heritage.EmptyAncestryTip"}}</div>
-                                </div>
-                                <div class="empty-ability-inner-container"></div>
-                            </div>
-                        {{/if}} 
-                    </div>
-                    <div class="heritage-card {{#if (not abilities.foundation.community)}}outlined{{/if}}">
-                        {{#if abilities.foundation.community}}
-                            {{> "systems/daggerheart/templates/sheets/character/parts/heritageCard.hbs" card=abilities.foundation.community }}
-                        {{else}}
-                            <div class="empty-ability-container">
-                                <div class="empty-ability-inner-container">
-                                    <div>{{localize "DAGGERHEART.Sheets.PC.Heritage.EmptyCommunity"}}</div>
-                                    <div>{{localize "DAGGERHEART.Sheets.PC.Heritage.EmptyCommunityTip"}}</div>
-                                </div>
-                                <div class="empty-ability-inner-container"></div>
-                            </div>
-                        {{/if}} 
-                    </div>
-                </div>
-                <div class="card-row">
-                    <div class="heritage-card {{#if (not abilities.foundation.advancement.foundation)}}outlined{{/if}}">
-                        {{#if abilities.foundation.advancement.foundation}}
-                            {{> "systems/daggerheart/templates/sheets/character/parts/advancementCard.hbs" card=abilities.foundation.advancement.foundation }}
-                        {{else}}
-                            <div class="empty-ability-container">
-                                <div class="empty-ability-inner-container">
-                                <div>{{localize "DAGGERHEART.Sheets.PC.Heritage.SubclassFoundation"}}</div>
-                                <div>{{localize "DAGGERHEART.Sheets.PC.Heritage.SubclassFoundationTip"}}</div>
-                                </div>
-                                <div class="empty-ability-inner-container"></div>
-                            </div>
-                        {{/if}}
-                    </div>
-                    <div class="heritage-card {{#if (not abilities.foundation.advancement.first)}}outlined{{/if}}">
-                        {{#if abilities.foundation.advancement.first}}
-                            {{> "systems/daggerheart/templates/sheets/character/parts/advancementCard.hbs" card=abilities.foundation.advancement.first }}
-                        {{else}}
-                            <div class="empty-ability-container">
-                                <div class="empty-ability-inner-container">
-                                    <div>{{localize "DAGGERHEART.Sheets.PC.Heritage.Subclass"}}</div>
-                                    <div>{{localize "DAGGERHEART.General.Or"}}</div>
-                                    <div>{{localize "DAGGERHEART.Sheets.PC.Heritage.Multiclass"}}</div>
-                                </div>
-                                <div class="empty-ability-inner-container"><i class="fa-solid fa-lock"></i></div>
-                            </div>                                
-                        {{/if}}
-                    </div>
-                    <div class="heritage-card {{#if (not abilities.foundation.advancement.second)}}outlined{{/if}}">
-                        {{#if abilities.foundation.advancement.second}}
-                            {{> "systems/daggerheart/templates/sheets/character/parts/advancementCard.hbs" card=abilities.foundation.advancement.second}}
-                        {{else}}
-                            <div class="empty-ability-container">
-                                <div class="empty-ability-inner-container">
-                                    <div>{{localize "DAGGERHEART.Sheets.PC.Heritage.Subclass"}}</div>
-                                    <div>{{localize "DAGGERHEART.General.Or"}}</div>
-                                    <div>{{localize "DAGGERHEART.Sheets.PC.Heritage.Multiclass"}}</div>
-                                </div>
-                                <div class="empty-ability-inner-container"><i class="fa-solid fa-lock"></i></div>
-                            </div>                               
-                        {{/if}}
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="tab" data-group="secondary" data-tab="loadout">
-            <div class="loadout-container">
-                <div class="top-card-row">
-                    {{#times 2}}
-                        <div class="domain-card {{#if (not (lookup ../abilities.loadout.top this))}}outlined{{/if}}">
-                            {{#with (lookup ../abilities.loadout.top this)}}
-                                {{> "systems/daggerheart/templates/sheets/parts/domainCard.hbs" card=this inVault=false }}
-                            {{/with}}
-                            {{#if (not (lookup ../abilities.loadout.top this))}}
-                                <div class="empty-ability-container">
-                                    <div class="empty-ability-inner-container">{{localize "DAGGERHEART.Sheets.PC.DomainCard.AvailableDomainSlot"}}</div>
-                                    <div class="empty-ability-inner-container"></div>
-                                </div>
-                            {{/if}}
-                        </div>
-                    {{/times}}
-                </div>
-                <div class="card-row">
-                    {{#times 3}}
-                        <div class="domain-card {{#if (not (lookup ../abilities.loadout.bottom this))}}outlined{{/if}}">
-                            {{#with (lookup ../abilities.loadout.bottom this)}}
-                                {{> "systems/daggerheart/templates/sheets/parts/domainCard.hbs" card=this inVault=false }}
-                            {{/with}}
-                            {{#if (gt (add this 3) ../actor/system/domainData.maxLoadout)}}
-                                <div class="empty-ability-container">
-                                        <div class="empty-ability-inner-container">{{localize "DAGGERHEART.Sheets.PC.DomainCard.UnavailableDomainSlot" level=(add this 2)}}</div>
-                                        <div class="empty-ability-inner-container"><i class="fa-solid fa-lock"></i></div>
-                                </div>
-                            {{/if}}
-                            
-                            {{#if (and (lte (add this 3) ../actor/system/domainData.maxLoadout) (lt ../abilities.loadout.bottom.length (add this 1)))}}
-                                 <div class="empty-ability-container">
-                                    <div class="empty-ability-inner-container">{{localize "DAGGERHEART.Sheets.PC.DomainCard.AvailableDomainSlot"}}</div>
-                                    <div class="empty-ability-inner-container"></div>
-                                </div>
-                            {{/if}}
-                        </div>
-                    {{/times}}
-                </div>
-            </div>
-        </div>
-        <div class="tab" data-group="secondary" data-tab="vault">
-            <div class="vault-container">
-                {{#each abilities.vault}}
-                    <div class="vault-card">
-                        {{> "systems/daggerheart/templates/sheets/parts/domainCard.hbs" card=this inVault=true }}
-                    </div>
-                {{/each}}
-            </div>
-        </div>
-    </section>
-</div>
\ No newline at end of file
diff --git a/templates/sheets/environment.hbs b/templates/sheets/environment.hbs
deleted file mode 100644
index 5a0f3bbb..00000000
--- a/templates/sheets/environment.hbs
+++ /dev/null
@@ -1,111 +0,0 @@
-<div>
-    <header class="adversary-header-container">
-        <div class="adversary-header flexrow">
-            <img class="flex0" src="{{source.img}}" data-action="onEditImage" data-edit="img" title="{{source.name}}" height="64" width="64"/>
-            <div class="adversary-title">
-                {{#if this.editMode}}
-                    <input class="title-text" name="name" type="text" value="{{source.name}}" placeholder="{{ localize 'Name' }}"/>
-                {{else}}
-                    <div class="title-text">{{source.name}}</div>
-                {{/if}}
-            </div>
-        </div>
-        <i class="fa-solid fa-wrench icon-button secondary {{#if this.editMode}}active{{/if}}" data-action="toggleSlider" style="position: absolute; right: 4px; top: 4px;"></i>
-    </header>
-    <section class="sheet-body">
-        {{#if this.editMode}}
-            <div>
-                <h2>{{localize "DAGGERHEART.Sheets.Adversary.Description"}}</h2>
-                <textarea name="system.description">{{source.system.description}}</textarea>
-                <h2>{{localize "DAGGERHEART.Sheets.Environment.ToneAndFeel"}}</h2>
-                <textarea name="system.toneAndFeel">{{source.system.toneAndFeel}}</textarea>
-            </div>
-            <div class="flexrow" style="align-items: baseline;">
-                <div class="adversary-statistics-container">
-                    <div class="form-group">
-                        <label>{{localize "DAGGERHEART.Sheets.Adversary.Tier"}}</label>
-                        <div class="form-fields">
-                            <select name="system.tier">
-                                {{selectOptions config.GENERAL.tiers selected=source.system.tier labelAttr="key"}}
-                            </select>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label>{{localize "DAGGERHEART.Sheets.Adversary.Type"}}</label>
-                        <div class="form-fields">
-                            <select name="system.type">
-                                {{selectOptions config.ACTOR.adversaryTypes selected=source.system.type labelAttr="name" localize=true}}
-                            </select>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label>{{localize "DAGGERHEART.Sheets.Adversary.Difficulty"}}</label>
-                        <div class="form-fields">
-                            <input type="text" name="system.difficulty" value="{{source.system.difficulty}}" data-dtype="Number" />
-                        </div>
-                    </div>
-                    <h2>{{localize "DAGGERHEART.Sheets.Environment.PotentialAdversaries"}}</h2>
-                    <textarea name="system.potentialAdversaries">{{source.system.potentialAdversaries}}</textarea>
-                </div>
-                <div class="adversary-moves-container">
-                    <h2 class="moves-edit-container">{{localize "DAGGERHEART.Sheets.Adversary.Features"}} <i class="fa-solid fa-plus" data-action="addFeature"></i></h2>
-                    {{#each data.features as |feature key|}}
-                        <div class="chip-container">
-                            <div class="chip-inner-container">
-                                <img src="{{feature.img}}" />
-                                <div class="move-title">{{feature.name}}</div>
-                            </div>
-                            <div class="chip-inner-container">
-                                <button data-action="viewFeature" data-feature={{feature.uuid}}><i class="fa-solid fa-fw fa-search"></i></button>
-                                <button data-action="removeFeature" data-feature={{feature.uuid}}><i class="fa-solid fa-trash"></i></button>
-                            </div>
-                        </div>
-                    {{/each}}
-                </div>
-            </div>
-        {{else}}
-            <div class="motive-container">
-                <div class="motive-title">
-                    <span class="motive-title-value"><strong>{{localize "DAGGERHEART.Sheets.Adversary.Description"}}:</strong> {{source.system.description}}</span>
-                </div>
-                <div class="motive-title">
-                    <span class="motive-title-value"><strong>{{localize "DAGGERHEART.Sheets.Environment.ToneAndFeel"}}:</strong> {{source.system.toneAndFeel}}</span>
-                </div>
-            </div>
-            <div class="flexrow" style="align-items: baseline;">
-                <div class="adversary-statistics-container">
-                    <div class="statistic-section">
-                        <div class="statistic-row">
-                            <label class="statistic-title">{{localize "DAGGERHEART.Sheets.Adversary.Tier"}}:</label>
-                            <span class="statistic-value">{{source.system.tier}}</span>
-                        </div>
-                        <div class="statistic-row">
-                            <label class="statistic-title">{{localize "DAGGERHEART.Sheets.Adversary.Type"}}:</label>
-                            <span class="statistic-value">{{this.data.type}}</span>
-                        </div>
-                    </div>
-                    <div class="statistic-section">
-                        <div class="statistic-row">
-                            <label class="statistic-title">{{localize "DAGGERHEART.Sheets.Adversary.Difficulty"}}:</label>
-                            <span class="statistic-value">{{source.system.difficulty}}</span>
-                        </div>
-                    </div>
-                    <div class="statistic-section">
-
-                            <label class="statistic-title">{{localize "DAGGERHEART.Sheets.Environment.PotentialAdversaries"}}:</label>
-                            <span>{{source.system.potentialAdversaries}}</span>
-                    </div>
-                </div>
-                <div class="adversary-moves-container">
-                    <div class="moves-title">{{localize "DAGGERHEART.Sheets.Adversary.Features"}}</div>
-                    {{#each data.features as |feature index|}}
-                        <div class="move-container" data-action="useFeature" data-feature="{{feature.uuid}}" data-action-type="{{feature.system.actionType}}">
-                            <label class="moves-name">{{feature.name}} - {{feature.system.actionType}}</label>
-                            <div class="move-description">{{{feature.system.description}}}</div>
-                        </div>
-                    {{/each}}
-                </div>
-            </div>
-        {{/if}}
-    </section>
-</div>
diff --git a/templates/sheets/global/partials/inventory-fieldset-items.hbs b/templates/sheets/global/partials/inventory-fieldset-items.hbs
index 81ff5094..0051d6df 100644
--- a/templates/sheets/global/partials/inventory-fieldset-items.hbs
+++ b/templates/sheets/global/partials/inventory-fieldset-items.hbs
@@ -49,6 +49,9 @@
                     {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-item.hbs' item=feature companion=true}}
                 {{/if}}
             {{/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}}
         {{/unless}}
         
     </ul>
diff --git a/templates/sheets/global/partials/inventory-item.hbs b/templates/sheets/global/partials/inventory-item.hbs
index a27bc3ce..491829d1 100644
--- a/templates/sheets/global/partials/inventory-item.hbs
+++ b/templates/sheets/global/partials/inventory-item.hbs
@@ -1,5 +1,5 @@
 <li class="inventory-item" data-item-id="{{item.id}}" data-companion="{{companion}}">
-    <img src="{{item.img}}" class="item-img" data-action="useItem"/>
+    <img src="{{item.img}}" class="item-img {{#if isActor}}actor-img{{/if}}" data-action="useItem"/>
     <div class="item-label">
         <div class="item-name">{{item.name}}</div>
         {{#if  (eq type 'weapon')}}
@@ -111,31 +111,48 @@
             </div>
         {{/if}}
     </div>
-    <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.Tooltip.equip'}}{{else}}{{localize 'DAGGERHEART.Tooltip.unequip'}}{{/unless}}">
-                <i class="fa-solid fa-hands"></i>
-            </a>
+    {{#unless hideControls}}
+        {{#if isActor}}
+            <div class="controls">
+                {{#if (eq type 'adversary')}}
+                    <a data-action="viewAdversary" data-potential-adversary="{{categoryAdversary}}" data-adversary="{{item.uuid}}" data-tooltip='{{localize "DAGGERHEART.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 "DAGGERHEART.Tooltip.delete"}}'>
+                        <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.Tooltip.equip'}}{{else}}{{localize 'DAGGERHEART.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.Tooltip.equip'}}{{else}}{{localize 'DAGGERHEART.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.Tooltip.sendToVault'}}">
+                            <i class="fa-solid fa-arrow-down"></i>
+                        </a>
+                    {{else}}
+                        <a data-action="toggleVault" data-tooltip="{{localize 'DAGGERHEART.Tooltip.sendToLoadout'}}">
+                            <i class="fa-solid fa-arrow-up"></i>
+                        </a>
+                    {{/unless}}
+                    
+                {{/if}}
+                <a data-action="toChat" data-tooltip="{{localize 'DAGGERHEART.Tooltip.sendToChat'}}"><i class="fa-regular fa-message"></i></a>
+                <a data-action="triggerContextMenu" data-tooltip="{{localize 'DAGGERHEART.Tooltip.moreOptions'}}"><i class="fa-solid fa-ellipsis-vertical"></i></a>
+            </div>
         {{/if}}
-        {{#if (eq type 'armor')}}
-            <a class="{{#unless item.system.equipped}}unequipped{{/unless}}" data-action="toggleEquipItem" data-tooltip="{{#unless item.system.equipped}}{{localize 'DAGGERHEART.Tooltip.equip'}}{{else}}{{localize 'DAGGERHEART.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.Tooltip.sendToVault'}}">
-                    <i class="fa-solid fa-arrow-down"></i>
-                </a>
-            {{else}}
-                <a data-action="toggleVault" data-tooltip="{{localize 'DAGGERHEART.Tooltip.sendToLoadout'}}">
-                    <i class="fa-solid fa-arrow-up"></i>
-                </a>
-            {{/unless}}
-            
-        {{/if}}
-        <a data-action="toChat" data-tooltip="{{localize 'DAGGERHEART.Tooltip.sendToChat'}}"><i class="fa-regular fa-message"></i></a>
-        <a data-action="triggerContextMenu" data-tooltip="{{localize 'DAGGERHEART.Tooltip.moreOptions'}}"><i class="fa-solid fa-ellipsis-vertical"></i></a>
-    </div>
+    {{else}}
+        <span></span>
+    {{/unless}}
     <div class="item-description">{{#unless isSidebar}}{{{item.system.description}}}{{/unless}}</div>
 </li>
\ No newline at end of file