diff --git a/.editorconfig b/.editorconfig
index aa391e00..6cfef2fc 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,6 +1,5 @@
 [*]
 indent_size = 4
 indent_style = spaces
-end_of_line = lf
 [*.yml]
 indent_size = 2
diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 00000000..6de9e5d0
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,13 @@
+{
+    "trailingComma": "none",
+    "tabWidth": 4,
+    "useTabs": false,
+    "semi": true,
+    "singleQuote": true,
+    "quoteProps": "consistent",
+    "bracketSpacing": true,
+    "arrowParens": "avoid",
+    "printWidth": 120,
+    "endOfLine": "lf",
+    "bracketSameLine": true
+}
diff --git a/README.md b/README.md
index ac3666b3..f59143fd 100644
--- a/README.md
+++ b/README.md
@@ -66,10 +66,6 @@ You can find the documentation here: https://github.com/Foundryborne/daggerheart
 
 Looking to contribute to the project? Look no further, check out our [contributing guide](CONTRIBUTING.md), and keep the [Code of Conduct](coc.md) in mind when working on things.
 
-## AI Policy
-
-The Foundryborne Daggerheart system does not make use of AI (generative or otherwise) for any area of its implementation. We expect all contributors to follow this same policy when contributing with a pull request; contributions made using AI will be rejected outright.
-
 ## Disclaimer:
 
 **Daggerheart System**
diff --git a/daggerheart.d.ts b/daggerheart.d.ts
index 7ff7fd59..ab754b17 100644
--- a/daggerheart.d.ts
+++ b/daggerheart.d.ts
@@ -1,11 +1,8 @@
 import '@client/global.mjs';
-import '@common/global.mjs';
-import '@common/primitives/global.mjs';
 import Canvas from '@client/canvas/board.mjs';
 
 // Foundry's use of `Object.assign(globalThis) means many globally available objects are not read as such
 // This declare global hopefully fixes that
-// Note: eslint is not aware of these, whatever is added here should go in the eslint's globals list
 declare global {
     /**
      * A simple event framework used throughout Foundry Virtual Tabletop.
@@ -15,28 +12,9 @@ declare global {
     class Hooks extends foundry.helpers.Hooks {}
     const fromUuid = foundry.utils.fromUuid;
     const fromUuidSync = foundry.utils.fromUuidSync;
-    /**
-     * A representation of a color in hexadecimal format.
-     * This class provides methods for transformations and manipulations of colors.
-     */
-    class Color extends foundry.utils.Color {}
+
     /**
      * The singleton game canvas
      */
     const canvas: Canvas;
-
-    const ActiveEffect: foundry.documents.ActiveEffect;
-    const Actor: foundry.documents.Actor;
-    const BaseScene: foundry.documents.BaseScene;
-    const ChatMessage: foundry.documents.ChatMessage;
-    const Combat: foundry.documents.Combat;
-    const Combatant: foundry.documents.Combatant;
-    const Item: foundry.documents.Item;
-    const Macro: foundry.documents.Macro;
-    const Scene: foundry.documents.Scene;
-    const TokenDocument: foundry.documents.TokenDocument;
-
-    const Collection: foundry.utils.Collection;
-    const FormDataExtended: foundry.applications.ux.FormDataExtended;
-    const TextEditor: foundry.applications.ux.TextEditor;
 }
diff --git a/daggerheart.mjs b/daggerheart.mjs
index 7bfdf874..23977628 100644
--- a/daggerheart.mjs
+++ b/daggerheart.mjs
@@ -446,33 +446,3 @@ Hooks.on('canvasTearDown', canvas => {
 Hooks.on('canvasReady', canas => {
     game.system.registeredTriggers.registerSceneTriggers(canvas.scene);
 });
-
-/** Make the user to select a document type, instead of having a default doc type for them to accidentally keep */
-Hooks.on('renderDialogV2', (_dialog, html) => {
-    if (!html.classList.contains('dialog')) return;
-    const cls = html.classList.contains('item-create')
-        ? documents.DHItem.implementation
-        : html.classList.contains('actor-create')
-            ? documents.DhpActor.implementation
-            : null;
-    if (!cls) return;
-
-    const form = html.querySelector('form');
-    const submit = html.querySelector('button[type=submit]');
-    const select = html.querySelector('select[name=type]');
-    const nameInput = html.querySelector('input[name=name]');
-    if (!form || !select || !submit || !nameInput) return;
-
-    nameInput.placeholder = cls.defaultName({});
-    const emptyOption = document.createElement('option');
-    emptyOption.value = '';
-    emptyOption.selected = true;
-    select.required = true;
-    select.prepend(emptyOption);
-    submit.addEventListener('click', event => {
-        if (!form.reportValidity()) {
-            event.preventDefault();
-            event.stopPropagation();
-        }
-    });
-});
diff --git a/eslint.config.mjs b/eslint.config.mjs
index 3c9b8fd9..ce2bb86f 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -1,101 +1,14 @@
 import globals from 'globals';
-import { defineConfig, globalIgnores } from 'eslint/config';
-import tseslint from 'typescript-eslint';
-import js from '@eslint/js';
-import stylistic from '@stylistic/eslint-plugin';
-
-/** @type {Partial<RulesConfig>} */
-export const stylisticRules = {
-    '@stylistic/indent': [
-        'error',
-        4,
-        {
-            SwitchCase: 1
-        }
-    ],
-    '@stylistic/max-len': ['error', { 
-        code: 120,
-        ignoreComments: true,
-        ignoreStrings: true,
-        ignoreTemplateLiterals: true,
-        ignoreRegExpLiterals: true
-    }],
-    '@stylistic/quotes': ['error', 'single', { allowTemplateLiterals: 'always' }],
-    '@stylistic/arrow-parens': ['error', 'as-needed'],
-    '@stylistic/quote-props': ['error', 'as-needed'],
-    '@stylistic/array-bracket-newline': ['error', 'consistent'],
-    '@stylistic/key-spacing': 'error',
-    '@stylistic/comma-dangle': ['error', 'never'],
-    '@stylistic/space-in-parens': ['error', 'never'],
-    '@stylistic/space-infix-ops': 2,
-    '@stylistic/keyword-spacing': 2,
-    '@stylistic/semi-spacing': 2,
-    '@stylistic/no-multi-spaces': 2,
-    '@stylistic/no-extra-semi': 2,
-    '@stylistic/no-whitespace-before-property': 2,
-    '@stylistic/space-unary-ops': 2
-};
+import { defineConfig } from 'eslint/config';
+import prettier from 'eslint-plugin-prettier';
 
 export default defineConfig([
-    globalIgnores(['foundry/**/*', 'build/**/*']),
-    {
-        files: ['gulpfile.js', 'postcss.config.js'],
-        languageOptions: { globals: globals.node }
-    },
+    { files: ['**/*.{js,mjs,cjs}'], languageOptions: { globals: globals.browser } },
+    { plugins: { prettier } },
     {
         files: ['**/*.{js,mjs,cjs}'],
-        plugins: {
-            '@stylistic': stylistic
-        },
-        languageOptions: {
-            globals: {
-                ...globals.browser,
-                CONFIG: 'readonly',
-                CONST: 'readonly',
-                // Global classes
-                Color: 'readonly',
-                Handlebars: 'readonly',
-                Hooks: 'readonly',
-                PIXI: 'readonly',
-                ProseMirror: 'readonly',
-                Roll: 'readonly',
-                // global namespaces
-                canvas: 'readonly',
-                foundry: 'readonly',
-                game: 'readonly',
-                ui: 'readonly',
-                // global functions
-                fromUuid: 'readonly',
-                fromUuidSync: 'readonly',
-                getDocumentClass: 'readonly',
-                _del: 'readonly',
-                _replace: 'readonly',
-                _loc: 'readonly',
-                // Documents
-                ActiveEffect: 'readonly',
-                Actor: 'readonly',
-                BaseScene: 'readonly',
-                ChatMessage: 'readonly',
-                Combat: 'readonly',
-                Combatant: 'readonly',
-                Item: 'readonly',
-                Macro: 'readonly',
-                Scene: 'readonly',
-                TokenDocument: 'readonly',
-                // Other
-                Collection: 'readonly',
-                FormDataExtended: 'readonly',
-                TextEditor: 'readonly'
-            }
-        },
         rules: {
-            'no-undef': 'error',
-            // 'no-unused-vars': ['error', { argsIgnorePattern: '^_', varsIgnorePattern: '^_' }],
-            ...stylisticRules
+            'prettier/prettier': 'error'
         }
-    },
-    {
-        files: ['**/*.ts'],
-        extends: [js.configs.recommended, tseslint.configs.recommended]
     }
 ]);
diff --git a/jsconfig.json b/jsconfig.json
index a0d51d0b..00bab1f5 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -1,7 +1,7 @@
 {
     "compilerOptions": {
-        "module": "es2022",
-        "target": "es2022",
+        "module": "ES6",
+        "target": "ES6",
         "paths": {
             "@client/*": ["./foundry/client/*"],
             "@common/*": ["./foundry/common/*"]
diff --git a/lang/en.json b/lang/en.json
index 3a1340e0..9ce515d9 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -711,9 +711,9 @@
             },
             "PendingReactionsDialog": {
                 "title": "Pending Reaction Rolls Found",
-                "unfinishedRolls": "Some Tokens have not finished their Reaction Rolls.",
-                "warning": "Unfinished reaction rolls will be considered as failed.",
-                "confirmation": "Are you sure you want to continue?"
+                "unfinishedRolls": "Some Tokens still need to roll their Reaction Roll.",
+                "confirmation": "Are you sure you want to continue ?",
+                "warning": "Undone reaction rolls will be considered as failed"
             },
             "ReactionRoll": {
                 "title": "Reaction Roll: {trait}"
diff --git a/module/applications/characterCreation/characterCreation.mjs b/module/applications/characterCreation/characterCreation.mjs
index 517f95da..82ca9ccb 100644
--- a/module/applications/characterCreation/characterCreation.mjs
+++ b/module/applications/characterCreation/characterCreation.mjs
@@ -154,8 +154,8 @@ export default class DhCharacterCreation extends HandlebarsApplicationMixin(Appl
             v.active = this.tabGroups[v.group]
                 ? this.tabGroups[v.group] === v.id
                 : this.tabGroups.primary !== 'equipment'
-                    ? v.active
-                    : false;
+                  ? v.active
+                  : false;
             v.cssClass = v.active ? 'active' : '';
 
             switch (v.id) {
@@ -211,9 +211,9 @@ export default class DhCharacterCreation extends HandlebarsApplicationMixin(Appl
 
         context.suggestedTraits = this.setup.class.system
             ? Object.keys(this.setup.class.system.characterGuide.suggestedTraits).map(traitKey => {
-                const trait = this.setup.class.system.characterGuide.suggestedTraits[traitKey];
-                return `${game.i18n.localize(`DAGGERHEART.CONFIG.Traits.${traitKey}.short`)} ${trait > 0 ? `+${trait}` : trait}`;
-            })
+                  const trait = this.setup.class.system.characterGuide.suggestedTraits[traitKey];
+                  return `${game.i18n.localize(`DAGGERHEART.CONFIG.Traits.${traitKey}.short`)} ${trait > 0 ? `+${trait}` : trait}`;
+              })
             : [];
         context.traits = {
             values: Object.keys(this.setup.traits).map(traitKey => {
@@ -450,7 +450,7 @@ export default class DhCharacterCreation extends HandlebarsApplicationMixin(Appl
         if (equipment.includes(type))
             presets.filter = {
                 'system.tier': { key: 'system.tier', value: 1 },
-                type: { key: 'type', value: type }
+                'type': { key: 'type', value: type }
             };
 
         ui.compendiumBrowser.open(presets);
diff --git a/module/applications/dialogs/d20RollDialog.mjs b/module/applications/dialogs/d20RollDialog.mjs
index 9a98b197..76b2e751 100644
--- a/module/applications/dialogs/d20RollDialog.mjs
+++ b/module/applications/dialogs/d20RollDialog.mjs
@@ -196,14 +196,14 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
             this.config.costs.indexOf(this.config.costs.find(c => c.extKey === button.dataset.key)) > -1
                 ? this.config.costs.filter(x => x.extKey !== button.dataset.key)
                 : [
-                    ...this.config.costs,
-                    {
-                        extKey: button.dataset.key,
-                        key: this.config?.data?.parent?.isNPC ? 'fear' : 'hope',
-                        value: 1,
-                        name: this.config.data?.system.experiences?.[button.dataset.key]?.name
-                    }
-                ];
+                      ...this.config.costs,
+                      {
+                          extKey: button.dataset.key,
+                          key: this.config?.data?.parent?.isNPC ? 'fear' : 'hope',
+                          value: 1,
+                          name: this.config.data?.system.experiences?.[button.dataset.key]?.name
+                      }
+                  ];
         this.render();
     }
 
@@ -213,8 +213,8 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
             this.config.actionType = this.reactionOverride
                 ? 'reaction'
                 : this.config.actionType === 'reaction'
-                    ? 'action'
-                    : this.config.actionType;
+                  ? 'action'
+                  : this.config.actionType;
             this.render();
         }
     }
diff --git a/module/applications/dialogs/damageReductionDialog.mjs b/module/applications/dialogs/damageReductionDialog.mjs
index e5108e34..b916a5de 100644
--- a/module/applications/dialogs/damageReductionDialog.mjs
+++ b/module/applications/dialogs/damageReductionDialog.mjs
@@ -138,13 +138,13 @@ export default class DamageReductionDialog extends HandlebarsApplicationMixin(Ap
         const stressReductionStress = this.availableStressReductions
             ? stressReductions.reduce((acc, red) => acc + red.cost, 0)
             : 0;
-        const stress = this.actor.system.resources.stress;
         context.stress =
             selectedStressMarks.length > 0 || this.availableStressReductions
                 ? {
-                    value: stress.value + selectedStressMarks.length + stressReductionStress,
-                    max: stress.max
-                }
+                      value:
+                          this.actor.system.resources.stress.value + selectedStressMarks.length + stressReductionStress,
+                      max: this.actor.system.resources.stress.max
+                  }
                 : null;
 
         context.maxArmorUsed = maxArmorUsed;
diff --git a/module/applications/dialogs/downtime.mjs b/module/applications/dialogs/downtime.mjs
index e209cc3b..367540bf 100644
--- a/module/applications/dialogs/downtime.mjs
+++ b/module/applications/dialogs/downtime.mjs
@@ -259,10 +259,10 @@ export default class DhpDowntime extends HandlebarsApplicationMixin(ApplicationV
                 const resetValue = increasing
                     ? 0
                     : feature.system.resource.max
-                        ? new Roll(
+                      ? new Roll(
                             Roll.replaceFormulaData(feature.system.resource.max, this.actor.getRollData())
                         ).evaluateSync().total
-                        : 0;
+                      : 0;
 
                 await feature.update({ 'system.resource.value': resetValue });
             }
diff --git a/module/applications/dialogs/groupRollDialog.mjs b/module/applications/dialogs/groupRollDialog.mjs
index 7196d848..dd504b4b 100644
--- a/module/applications/dialogs/groupRollDialog.mjs
+++ b/module/applications/dialogs/groupRollDialog.mjs
@@ -167,8 +167,8 @@ export default class GroupRollDialog extends HandlebarsApplicationMixin(Applicat
                 partContext.groupRoll = {
                     totalLabel: leader?.rollData
                         ? game.i18n.format('DAGGERHEART.GENERAL.withThing', {
-                            thing: leader.roll.totalLabel
-                        })
+                              thing: leader.roll.totalLabel
+                          })
                         : null,
                     totalDualityClass: leader?.roll?.isCritical ? 'critical' : leader?.roll?.withHope ? 'hope' : 'fear',
                     total: leaderTotal + modifierTotal,
diff --git a/module/applications/dialogs/tagTeamDialog.mjs b/module/applications/dialogs/tagTeamDialog.mjs
index b2ce0258..3dc6b0fc 100644
--- a/module/applications/dialogs/tagTeamDialog.mjs
+++ b/module/applications/dialogs/tagTeamDialog.mjs
@@ -653,8 +653,8 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
             const baseSecondaryRoll = selectedRoll
                 ? memberValues.find(x => !x.selected)
                 : memberValues.length > 1
-                    ? memberValues[1]
-                    : null;
+                  ? memberValues[1]
+                  : null;
 
             if (!baseMainRoll?.rollData || !baseSecondaryRoll) return null;
 
diff --git a/module/applications/hud/tokenHUD.mjs b/module/applications/hud/tokenHUD.mjs
index 4805cd9e..671b01a1 100644
--- a/module/applications/hud/tokenHUD.mjs
+++ b/module/applications/hud/tokenHUD.mjs
@@ -50,11 +50,11 @@ export default class DHTokenHUD extends foundry.applications.hud.TokenHUD {
         ).showGenericStatusEffects;
         context.genericStatusEffects = useGeneric
             ? Object.keys(context.statusEffects).reduce((acc, key) => {
-                const effect = context.statusEffects[key];
-                if (!effect.systemEffect) acc[key] = effect;
+                  const effect = context.statusEffects[key];
+                  if (!effect.systemEffect) acc[key] = effect;
 
-                return acc;
-            }, {})
+                  return acc;
+              }, {})
             : null;
 
         context.hasCompanion = this.actor.system.companion;
@@ -68,11 +68,11 @@ export default class DHTokenHUD extends foundry.applications.hud.TokenHUD {
         const warning =
             tokensWithoutActors.length === 1
                 ? game.i18n.format('DAGGERHEART.UI.Notifications.tokenActorMissing', {
-                    name: tokensWithoutActors[0].name
-                })
+                      name: tokensWithoutActors[0].name
+                  })
                 : game.i18n.format('DAGGERHEART.UI.Notifications.tokenActorsMissing', {
-                    names: tokensWithoutActors.map(x => x.name).join(', ')
-                });
+                      names: tokensWithoutActors.map(x => x.name).join(', ')
+                  });
 
         const tokens = canvas.tokens.controlled
             .filter(t => t.actor && !DHTokenHUD.#nonCombatTypes.includes(t.actor.type))
@@ -174,8 +174,8 @@ export default class DHTokenHUD extends foundry.applications.hud.TokenHUD {
                             nonZeroIndex === sideMiddle
                                 ? 0
                                 : nonZeroIndex < sideMiddle
-                                    ? -nonZeroIndex
-                                    : nonZeroIndex - sideMiddle;
+                                  ? -nonZeroIndex
+                                  : nonZeroIndex - sideMiddle;
                         return { x: actorX - sizeX * distance, y: actorY - sizeY * distanceCoefficient };
                     } else if (index < side + inbetween) {
                         const inbetweenIndex = nonZeroIndex - side;
@@ -183,8 +183,8 @@ export default class DHTokenHUD extends foundry.applications.hud.TokenHUD {
                             inbetweenIndex === inbetweenMiddle
                                 ? 0
                                 : inbetweenIndex < inbetweenMiddle
-                                    ? -inbetweenIndex
-                                    : inbetweenIndex - inbetweenMiddle;
+                                  ? -inbetweenIndex
+                                  : inbetweenIndex - inbetweenMiddle;
                         return { x: actorX + sizeX * distanceCoefficient, y: actorY + sizeY * distance };
                     } else if (index < 2 * side + inbetween) {
                         const sideIndex = nonZeroIndex - side - inbetween;
@@ -192,8 +192,8 @@ export default class DHTokenHUD extends foundry.applications.hud.TokenHUD {
                             sideIndex === sideMiddle
                                 ? 0
                                 : sideIndex < sideMiddle
-                                    ? sideIndex
-                                    : -(sideIndex - sideMiddle);
+                                  ? sideIndex
+                                  : -(sideIndex - sideMiddle);
                         return { x: actorX + sizeX * distance, y: actorY + sizeY * distanceCoefficient };
                     } else {
                         const inbetweenIndex = nonZeroIndex - 2 * side - inbetween;
@@ -201,8 +201,8 @@ export default class DHTokenHUD extends foundry.applications.hud.TokenHUD {
                             inbetweenIndex === inbetweenMiddle
                                 ? 0
                                 : inbetweenIndex < inbetweenMiddle
-                                    ? inbetweenIndex
-                                    : -(inbetweenIndex - inbetweenMiddle);
+                                  ? inbetweenIndex
+                                  : -(inbetweenIndex - inbetweenMiddle);
                         return { x: actorX - sizeX * distanceCoefficient, y: actorY + sizeY * distance };
                     }
                 })
diff --git a/module/applications/levelup/characterLevelup.mjs b/module/applications/levelup/characterLevelup.mjs
index a2df63c1..e8d6cf1c 100644
--- a/module/applications/levelup/characterLevelup.mjs
+++ b/module/applications/levelup/characterLevelup.mjs
@@ -210,9 +210,9 @@ export default class DhCharacterLevelUp extends LevelUpBase {
 
                     achievementExperiences = level.achievements.experiences
                         ? Object.values(level.achievements.experiences).reduce((acc, experience) => {
-                            if (experience.name) acc.push(experience);
-                            return acc;
-                        }, [])
+                              if (experience.name) acc.push(experience);
+                              return acc;
+                          }, [])
                         : [];
                 }
 
@@ -315,15 +315,15 @@ export default class DhCharacterLevelUp extends LevelUpBase {
                                         : null;
                                     advancement[choiceKey] = multiclassItem
                                         ? {
-                                            ...multiclassItem.toObject(),
-                                            domain: checkbox.secondaryData.domain
-                                                ? game.i18n.localize(
-                                                    CONFIG.DH.DOMAIN.allDomains()[checkbox.secondaryData.domain]
-                                                        .label
-                                                )
-                                                : null,
-                                            subclass: subclass ? subclass.name : null
-                                        }
+                                              ...multiclassItem.toObject(),
+                                              domain: checkbox.secondaryData.domain
+                                                  ? game.i18n.localize(
+                                                        CONFIG.DH.DOMAIN.allDomains()[checkbox.secondaryData.domain]
+                                                            .label
+                                                    )
+                                                  : null,
+                                              subclass: subclass ? subclass.name : null
+                                          }
                                         : {};
                                     break;
                             }
diff --git a/module/applications/levelup/companionLevelup.mjs b/module/applications/levelup/companionLevelup.mjs
index 92cf3050..d6bf2d78 100644
--- a/module/applications/levelup/companionLevelup.mjs
+++ b/module/applications/levelup/companionLevelup.mjs
@@ -77,9 +77,9 @@ export default class DhCompanionLevelUp extends BaseLevelUp {
 
                     achievementExperiences = level.achievements.experiences
                         ? Object.values(level.achievements.experiences).reduce((acc, experience) => {
-                            if (experience.name) acc.push(experience);
-                            return acc;
-                        }, [])
+                              if (experience.name) acc.push(experience);
+                              return acc;
+                          }, [])
                         : [];
                 }
                 context.achievements = {
@@ -155,15 +155,15 @@ export default class DhCompanionLevelUp extends BaseLevelUp {
                     vicious: {
                         damage: advancement.vicious?.damage
                             ? {
-                                old: actorDamageDice,
-                                new: advancement.vicious.damage
-                            }
+                                  old: actorDamageDice,
+                                  new: advancement.vicious.damage
+                              }
                             : null,
                         range: advancement.vicious?.range
                             ? {
-                                old: game.i18n.localize(`DAGGERHEART.CONFIG.Range.${actorRange}.name`),
-                                new: game.i18n.localize(advancement.vicious.range.label)
-                            }
+                                  old: game.i18n.localize(`DAGGERHEART.CONFIG.Range.${actorRange}.name`),
+                                  new: game.i18n.localize(advancement.vicious.range.label)
+                              }
                             : null
                     },
                     simple: advancement.simple ?? {}
diff --git a/module/applications/levelup/levelup.mjs b/module/applications/levelup/levelup.mjs
index cafc5c89..c4616d9a 100644
--- a/module/applications/levelup/levelup.mjs
+++ b/module/applications/levelup/levelup.mjs
@@ -135,6 +135,192 @@ export default class DhlevelUp extends HandlebarsApplicationMixin(ApplicationV2)
                 context.tabs.advancements.progress = { selected: selections, max: currentLevel.maxSelections };
                 context.showTabs = this.tabGroups.primary !== 'summary';
                 break;
+
+                const actorArmor = this.actor.system.armor;
+                const levelKeys = Object.keys(this.levelup.levels);
+                let achivementProficiency = 0;
+                const achievementCards = [];
+                let achievementExperiences = [];
+                for (var levelKey of levelKeys) {
+                    const level = this.levelup.levels[levelKey];
+                    if (Number(levelKey) < this.levelup.startLevel) continue;
+
+                    achivementProficiency += level.achievements.proficiency ?? 0;
+                    const cards = level.achievements.domainCards ? Object.values(level.achievements.domainCards) : null;
+                    if (cards) {
+                        for (var card of cards) {
+                            const itemCard = await foundry.utils.fromUuid(card.uuid);
+                            achievementCards.push(itemCard);
+                        }
+                    }
+
+                    achievementExperiences = level.achievements.experiences
+                        ? Object.values(level.achievements.experiences).reduce((acc, experience) => {
+                              if (experience.name) acc.push(experience);
+                              return acc;
+                          }, [])
+                        : [];
+                }
+
+                context.achievements = {
+                    proficiency: {
+                        old: this.actor.system.proficiency,
+                        new: this.actor.system.proficiency + achivementProficiency,
+                        shown: achivementProficiency > 0
+                    },
+                    damageThresholds: {
+                        major: {
+                            old: this.actor.system.damageThresholds.major,
+                            new: this.actor.system.damageThresholds.major + changedActorLevel - currentActorLevel
+                        },
+                        severe: {
+                            old: this.actor.system.damageThresholds.severe,
+                            new:
+                                this.actor.system.damageThresholds.severe +
+                                (actorArmor
+                                    ? changedActorLevel - currentActorLevel
+                                    : (changedActorLevel - currentActorLevel) * 2)
+                        },
+                        unarmored: !actorArmor
+                    },
+                    domainCards: {
+                        values: achievementCards,
+                        shown: achievementCards.length > 0
+                    },
+                    experiences: {
+                        values: achievementExperiences
+                    }
+                };
+
+                const advancement = {};
+                for (var levelKey of levelKeys) {
+                    const level = this.levelup.levels[levelKey];
+                    if (Number(levelKey) < this.levelup.startLevel) continue;
+
+                    for (var choiceKey of Object.keys(level.choices)) {
+                        const choice = level.choices[choiceKey];
+                        for (var checkbox of Object.values(choice)) {
+                            switch (choiceKey) {
+                                case 'proficiency':
+                                case 'hitPoint':
+                                case 'stress':
+                                case 'evasion':
+                                    advancement[choiceKey] = advancement[choiceKey]
+                                        ? advancement[choiceKey] + Number(checkbox.value)
+                                        : Number(checkbox.value);
+                                    break;
+                                case 'trait':
+                                    if (!advancement[choiceKey]) advancement[choiceKey] = {};
+                                    for (var traitKey of checkbox.data) {
+                                        if (!advancement[choiceKey][traitKey]) advancement[choiceKey][traitKey] = 0;
+                                        advancement[choiceKey][traitKey] += 1;
+                                    }
+                                    break;
+                                case 'domainCard':
+                                    if (!advancement[choiceKey]) advancement[choiceKey] = [];
+                                    if (checkbox.data.length === 1) {
+                                        const choiceItem = await foundry.utils.fromUuid(checkbox.data[0]);
+                                        advancement[choiceKey].push(choiceItem.toObject());
+                                    }
+                                    break;
+                                case 'experience':
+                                    if (!advancement[choiceKey]) advancement[choiceKey] = [];
+                                    const data = checkbox.data.map(data => {
+                                        const experience = Object.keys(this.actor.system.experiences).find(
+                                            x => x === data
+                                        );
+                                        return this.actor.system.experiences[experience]?.description ?? '';
+                                    });
+                                    advancement[choiceKey].push({ data: data, value: checkbox.value });
+                                    break;
+                                case 'subclass':
+                                    if (checkbox.data[0]) {
+                                        const subclassItem = await foundry.utils.fromUuid(checkbox.data[0]);
+                                        if (!advancement[choiceKey]) advancement[choiceKey] = [];
+                                        advancement[choiceKey].push({
+                                            ...subclassItem.toObject(),
+                                            featureLabel: game.i18n.localize(
+                                                subclassFeatureLabels[Number(checkbox.secondaryData.featureState)]
+                                            )
+                                        });
+                                    }
+                                    break;
+                                case 'multiclass':
+                                    const multiclassItem = await foundry.utils.fromUuid(checkbox.data[0]);
+                                    const subclass = multiclassItem
+                                        ? await foundry.utils.fromUuid(checkbox.secondaryData.subclass)
+                                        : null;
+                                    advancement[choiceKey] = multiclassItem
+                                        ? {
+                                              ...multiclassItem.toObject(),
+                                              domain: checkbox.secondaryData.domain
+                                                  ? game.i18n.localize(
+                                                        CONFIG.DH.DOMAIN.allDomains()[checkbox.secondaryData.domain]
+                                                            .label
+                                                    )
+                                                  : null,
+                                              subclass: subclass ? subclass.name : null
+                                          }
+                                        : {};
+                                    break;
+                            }
+                        }
+                    }
+                }
+
+                context.advancements = {
+                    statistics: {
+                        proficiency: {
+                            old: context.achievements.proficiency.new,
+                            new: context.achievements.proficiency.new + (advancement.proficiency ?? 0)
+                        },
+                        hitPoints: {
+                            old: this.actor.system.resources.hitPoints.max,
+                            new: this.actor.system.resources.hitPoints.max + (advancement.hitPoint ?? 0)
+                        },
+                        stress: {
+                            old: this.actor.system.resources.stress.max,
+                            new: this.actor.system.resources.stress.max + (advancement.stress ?? 0)
+                        },
+                        evasion: {
+                            old: this.actor.system.evasion,
+                            new: this.actor.system.evasion + (advancement.evasion ?? 0)
+                        }
+                    },
+                    traits: Object.keys(this.actor.system.traits).reduce((acc, traitKey) => {
+                        if (advancement.trait?.[traitKey]) {
+                            if (!acc) acc = {};
+                            acc[traitKey] = {
+                                label: game.i18n.localize(abilities[traitKey].label),
+                                old: this.actor.system.traits[traitKey].value,
+                                new: this.actor.system.traits[traitKey].value + advancement.trait[traitKey]
+                            };
+                        }
+                        return acc;
+                    }, null),
+                    domainCards: advancement.domainCard ?? [],
+                    experiences:
+                        advancement.experience?.flatMap(x => x.data.map(data => ({ name: data, modifier: x.value }))) ??
+                        [],
+                    multiclass: advancement.multiclass,
+                    subclass: advancement.subclass
+                };
+
+                context.advancements.statistics.proficiency.shown =
+                    context.advancements.statistics.proficiency.new > context.advancements.statistics.proficiency.old;
+                context.advancements.statistics.hitPoints.shown =
+                    context.advancements.statistics.hitPoints.new > context.advancements.statistics.hitPoints.old;
+                context.advancements.statistics.stress.shown =
+                    context.advancements.statistics.stress.new > context.advancements.statistics.stress.old;
+                context.advancements.statistics.evasion.shown =
+                    context.advancements.statistics.evasion.new > context.advancements.statistics.evasion.old;
+                context.advancements.statistics.shown =
+                    context.advancements.statistics.proficiency.shown ||
+                    context.advancements.statistics.hitPoints.shown ||
+                    context.advancements.statistics.stress.shown ||
+                    context.advancements.statistics.evasion.shown;
+
+                break;
         }
 
         return context;
@@ -172,14 +358,14 @@ export default class DhlevelUp extends HandlebarsApplicationMixin(ApplicationV2)
         const experienceIncreaseTagify = htmlElement.querySelector('.levelup-experience-increases');
         if (experienceIncreaseTagify) {
             const allExperiences = {
+                ...this.actor.system.experiences,
                 ...Object.values(this.levelup.levels).reduce((acc, level) => {
                     for (const key of Object.keys(level.achievements.experiences)) {
                         acc[key] = level.achievements.experiences[key];
                     }
 
                     return acc;
-                }, {}),
-                ...this.actor.system.experiences
+                }, {})
             };
             tagifyElement(
                 experienceIncreaseTagify,
@@ -198,35 +384,37 @@ export default class DhlevelUp extends HandlebarsApplicationMixin(ApplicationV2)
         this._dragDrop.forEach(d => d.bind(htmlElement));
     }
 
-    tagifyUpdate = type => async (_, { option, removed }) => {
-        const updatePath = Object.keys(this.levelup.levels[this.levelup.currentLevel].choices).reduce(
-            (acc, choiceKey) => {
-                const choice = this.levelup.levels[this.levelup.currentLevel].choices[choiceKey];
-                Object.keys(choice).forEach(checkboxNr => {
-                    const checkbox = choice[checkboxNr];
-                    if (
-                        choiceKey === type &&
-                    (removed ? checkbox.data.includes(option) : checkbox.data.length < checkbox.amount)
-                    ) {
-                        acc = `levels.${this.levelup.currentLevel}.choices.${choiceKey}.${checkboxNr}.data`;
-                    }
-                });
+    tagifyUpdate =
+        type =>
+        async (_, { option, removed }) => {
+            const updatePath = Object.keys(this.levelup.levels[this.levelup.currentLevel].choices).reduce(
+                (acc, choiceKey) => {
+                    const choice = this.levelup.levels[this.levelup.currentLevel].choices[choiceKey];
+                    Object.keys(choice).forEach(checkboxNr => {
+                        const checkbox = choice[checkboxNr];
+                        if (
+                            choiceKey === type &&
+                            (removed ? checkbox.data.includes(option) : checkbox.data.length < checkbox.amount)
+                        ) {
+                            acc = `levels.${this.levelup.currentLevel}.choices.${choiceKey}.${checkboxNr}.data`;
+                        }
+                    });
 
-                return acc;
-            },
-            null
-        );
+                    return acc;
+                },
+                null
+            );
 
-        if (!updatePath) {
-            ui.notifications.error(game.i18n.localize('DAGGERHEART.UI.Notifications.noSelectionsLeft'));
-            return;
-        }
+            if (!updatePath) {
+                ui.notifications.error(game.i18n.localize('DAGGERHEART.UI.Notifications.noSelectionsLeft'));
+                return;
+            }
 
-        const currentData = foundry.utils.getProperty(this.levelup, updatePath);
-        const updatedData = removed ? currentData.filter(x => x !== option) : [...currentData, option];
-        await this.levelup.updateSource({ [updatePath]: updatedData });
-        this.render();
-    };
+            const currentData = foundry.utils.getProperty(this.levelup, updatePath);
+            const updatedData = removed ? currentData.filter(x => x !== option) : [...currentData, option];
+            await this.levelup.updateSource({ [updatePath]: updatedData });
+            this.render();
+        };
 
     static async updateForm(event, _, formData) {
         const { levelup } = foundry.utils.expandObject(formData.object);
@@ -405,10 +593,10 @@ export default class DhlevelUp extends HandlebarsApplicationMixin(ApplicationV2)
         const domainCards = this.levelup.levels[this.levelup.currentLevel].achievements.domainCards;
         const illegalDomainCards = option.secondaryData.domain
             ? Object.keys(domainCards)
-                .map(key => ({ ...domainCards[key], key }))
-                .filter(
-                    x => x.uuid && foundry.utils.fromUuidSync(x.uuid).system.domain === option.secondaryData.domain
-                )
+                  .map(key => ({ ...domainCards[key], key }))
+                  .filter(
+                      x => x.uuid && foundry.utils.fromUuidSync(x.uuid).system.domain === option.secondaryData.domain
+                  )
             : [];
         illegalDomainCards.forEach(card => {
             update[`levels.${this.levelup.currentLevel}.achievements.domainCards.${card.key}.uuid`] = null;
diff --git a/module/applications/settings/homebrewSettings.mjs b/module/applications/settings/homebrewSettings.mjs
index c4dfc397..40ea0301 100644
--- a/module/applications/settings/homebrewSettings.mjs
+++ b/module/applications/settings/homebrewSettings.mjs
@@ -111,7 +111,7 @@ export default class DhHomebrewSettings extends HandlebarsApplicationMixin(Appli
 
         switch (partId) {
             case 'domains':
-                const selectedDomain = this.settings.domains[this.selected.domain] ?? null;
+                const selectedDomain = this.selected.domain ? this.settings.domains[this.selected.domain] : null;
                 const enrichedDescription = selectedDomain
                     ? await foundry.applications.ux.TextEditor.implementation.enrichHTML(selectedDomain.description)
                     : null;
@@ -251,8 +251,8 @@ export default class DhHomebrewSettings extends HandlebarsApplicationMixin(Appli
         const configTitle = isDowntime
             ? game.i18n.localize('DAGGERHEART.SETTINGS.Homebrew.downtimeMove')
             : type === 'armorFeatures'
-                ? game.i18n.localize('DAGGERHEART.SETTINGS.Homebrew.armorFeature')
-                : game.i18n.localize('DAGGERHEART.SETTINGS.Homebrew.weaponFeature');
+              ? game.i18n.localize('DAGGERHEART.SETTINGS.Homebrew.armorFeature')
+              : game.i18n.localize('DAGGERHEART.SETTINGS.Homebrew.weaponFeature');
 
         const editedBase = await game.system.api.applications.sheetConfigs.SettingFeatureConfig.configure(
             configTitle,
diff --git a/module/applications/sheets-configs/action-base-config.mjs b/module/applications/sheets-configs/action-base-config.mjs
index b65e1cdf..e83dfae4 100644
--- a/module/applications/sheets-configs/action-base-config.mjs
+++ b/module/applications/sheets-configs/action-base-config.mjs
@@ -204,7 +204,7 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
             };
         }
 
-        if (this.action.parent.metadata?.isInventoryItem) {
+        if (this.action.parent.metadata.isInventoryItem) {
             options.quantity = {
                 label: 'DAGGERHEART.GENERAL.itemQuantity',
                 group: 'Global'
diff --git a/module/applications/sheets-configs/setting-feature-config.mjs b/module/applications/sheets-configs/setting-feature-config.mjs
index 531158cd..a5bcc4f9 100644
--- a/module/applications/sheets-configs/setting-feature-config.mjs
+++ b/module/applications/sheets-configs/setting-feature-config.mjs
@@ -168,8 +168,8 @@ export default class SettingFeatureConfig extends HandlebarsApplicationMixin(App
                     updatedEffects = deleteEffect
                         ? currentEffects.filter(x => x.id !== effectData.id)
                         : existingEffectIndex === -1
-                            ? [...currentEffects, effectData]
-                            : currentEffects.with(existingEffectIndex, effectData);
+                          ? [...currentEffects, effectData]
+                          : currentEffects.with(existingEffectIndex, effectData);
                     await this.updateMove({
                         [`${this.movePath}.effects`]: updatedEffects
                     });
@@ -235,9 +235,9 @@ export default class SettingFeatureConfig extends HandlebarsApplicationMixin(App
         return this.hasEffects
             ? tabs
             : Object.keys(tabs).reduce((acc, key) => {
-                if (key !== 'effects') acc[key] = tabs[key];
-                return acc;
-            }, {});
+                  if (key !== 'effects') acc[key] = tabs[key];
+                  return acc;
+              }, {});
     }
 
     /** @override */
diff --git a/module/applications/sheets/actors/adversary.mjs b/module/applications/sheets/actors/adversary.mjs
index 06dd4a0f..04be3efb 100644
--- a/module/applications/sheets/actors/adversary.mjs
+++ b/module/applications/sheets/actors/adversary.mjs
@@ -31,16 +31,6 @@ export default class AdversarySheet extends DHBaseActorSheet {
                 dragSelector: '[data-item-id][draggable="true"], [data-item-id] [draggable="true"]',
                 dropSelector: null
             }
-        ],
-        contextMenus: [
-            {
-                handler: DHBaseActorSheet.getBaseAttackContextOptions,
-                selector: '[data-item-uuid][data-type="attack"]',
-                options: {
-                    parentClassHooks: false,
-                    fixed: true
-                }
-            }
         ]
     };
 
diff --git a/module/applications/sheets/actors/character.mjs b/module/applications/sheets/actors/character.mjs
index bc2cdb41..19b82712 100644
--- a/module/applications/sheets/actors/character.mjs
+++ b/module/applications/sheets/actors/character.mjs
@@ -65,14 +65,6 @@ export default class CharacterSheet extends DHBaseActorSheet {
                     fixed: true
                 }
             },
-            {
-                handler: DHBaseActorSheet.getBaseAttackContextOptions,
-                selector: '[data-item-uuid][data-type="attack"]',
-                options: {
-                    parentClassHooks: false,
-                    fixed: true
-                }
-            },
             {
                 handler: CharacterSheet.#getDomainCardContextOptions,
                 selector: '[data-item-uuid][data-type="domainCard"]',
@@ -785,11 +777,11 @@ export default class CharacterSheet extends DHBaseActorSheet {
             filter:
                 key === 'subclasses'
                     ? {
-                        'system.linkedClass.uuid': {
-                            key: 'system.linkedClass.uuid',
-                            value: this.document.system.class.value?._stats.compendiumSource
-                        }
-                    }
+                          'system.linkedClass.uuid': {
+                              key: 'system.linkedClass.uuid',
+                              value: this.document.system.class.value?._stats.compendiumSource
+                          }
+                      }
                     : undefined,
             render: {
                 noFolder: true
@@ -1053,7 +1045,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
         game.tooltip.activate(target, {
             html,
             locked: true,
-            cssClass: 'bordered-tooltip dh-style',
+            cssClass: 'bordered-tooltip',
             direction: 'DOWN'
         });
 
@@ -1149,7 +1141,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
         game.tooltip.activate(target, {
             html,
             locked: true,
-            cssClass: 'bordered-tooltip dh-style',
+            cssClass: 'bordered-tooltip',
             direction: 'DOWN',
             noOffset: true
         });
diff --git a/module/applications/sheets/actors/companion.mjs b/module/applications/sheets/actors/companion.mjs
index a01b4a64..b30b9c07 100644
--- a/module/applications/sheets/actors/companion.mjs
+++ b/module/applications/sheets/actors/companion.mjs
@@ -11,17 +11,7 @@ export default class DhCompanionSheet extends DHBaseActorSheet {
             toggleStress: DhCompanionSheet.#toggleStress,
             actionRoll: DhCompanionSheet.#actionRoll,
             levelManagement: DhCompanionSheet.#levelManagement
-        },
-        contextMenus: [
-            {
-                handler: DHBaseActorSheet.getBaseAttackContextOptions,
-                selector: '[data-item-uuid][data-type="attack"]',
-                options: {
-                    parentClassHooks: false,
-                    fixed: true
-                }
-            }
-        ]
+        }
     };
 
     static PARTS = {
diff --git a/module/applications/sheets/actors/party.mjs b/module/applications/sheets/actors/party.mjs
index 3af8ea5f..cec1e1f0 100644
--- a/module/applications/sheets/actors/party.mjs
+++ b/module/applications/sheets/actors/party.mjs
@@ -47,6 +47,11 @@ export default class Party extends DHBaseActorSheet {
             template: 'systems/daggerheart/templates/sheets/actors/party/party-members.hbs',
             scrollable: ['']
         },
+        /* NOT YET IMPLEMENTED */
+        // projects: {
+        //     template: 'systems/daggerheart/templates/sheets/actors/party/projects.hbs',
+        //     scrollable: ['']
+        // },
         inventory: {
             template: 'systems/daggerheart/templates/sheets/actors/party/inventory.hbs',
             scrollable: ['.tab.inventory .items-section']
@@ -57,13 +62,19 @@ export default class Party extends DHBaseActorSheet {
     /** @inheritdoc */
     static TABS = {
         primary: {
-            tabs: [{ id: 'partyMembers' }, { id: 'inventory' }, { id: 'notes' }],
+            tabs: [
+                { id: 'partyMembers' },
+                /* NOT YET IMPLEMENTED */
+                // { id: 'projects' },
+                { id: 'inventory' },
+                { id: 'notes' }
+            ],
             initial: 'partyMembers',
             labelPrefix: 'DAGGERHEART.GENERAL.Tabs'
         }
     };
 
-    static ALLOWED_ACTOR_TYPES = ['character', 'companion', 'adversary', 'npc'];
+    static ALLOWED_ACTOR_TYPES = ['character', 'companion', 'adversary'];
     static DICE_ROLL_ACTOR_TYPES = ['character'];
 
     async _onRender(context, options) {
@@ -162,9 +173,9 @@ export default class Party extends DHBaseActorSheet {
                 difficulty: actor.system.difficulty,
                 traits: actor.system.traits
                     ? traits.map(t => ({
-                        label: game.i18n.localize(`DAGGERHEART.CONFIG.Traits.${t}.short`),
-                        value: actor.system.traits[t].value
-                    }))
+                          label: game.i18n.localize(`DAGGERHEART.CONFIG.Traits.${t}.short`),
+                          value: actor.system.traits[t].value
+                      }))
                     : null,
                 weapons
             });
@@ -306,7 +317,7 @@ export default class Party extends DHBaseActorSheet {
 
     static async downtimeMoveQuery({ actorId, downtimeType }) {
         const actor = await foundry.utils.fromUuid(actorId);
-        if (!actor || !actor?.isOwner) return;
+        if (!actor || !actor?.isOwner) reject();
         new game.system.api.applications.dialogs.Downtime(actor, downtimeType === 'shortRest').render({
             force: true
         });
diff --git a/module/applications/sheets/api/application-mixin.mjs b/module/applications/sheets/api/application-mixin.mjs
index 63bbb536..2b0c3e55 100644
--- a/module/applications/sheets/api/application-mixin.mjs
+++ b/module/applications/sheets/api/application-mixin.mjs
@@ -722,10 +722,10 @@ export default function DHApplicationMixin(Base) {
             const parent = featureOnCharacter
                 ? this.document.parent
                 : parentIsItem && documentClass === 'Item'
-                    ? type === 'action'
-                        ? this.document.system
-                        : null
-                    : this.document;
+                  ? type === 'action'
+                      ? this.document.system
+                      : null
+                  : this.document;
 
             let systemData = {};
             if (featureOnCharacter) {
diff --git a/module/applications/sheets/api/base-actor.mjs b/module/applications/sheets/api/base-actor.mjs
index 812ad311..5cd0f6a5 100644
--- a/module/applications/sheets/api/base-actor.mjs
+++ b/module/applications/sheets/api/base-actor.mjs
@@ -189,43 +189,6 @@ export default class DHBaseActorSheet extends DHApplicationMixin(ActorSheetV2) {
         return this._getContextMenuCommonOptions.call(this, { usable: true, toChat: true });
     }
 
-    /**
-     * Get the set of ContextMenu options for the base attack.
-     * @returns {import('@client/applications/ux/context-menu.mjs').ContextMenuEntry[]} - The Array of context options passed to the ContextMenu instance
-     * @this {CharacterSheet}
-     * @protected
-     */
-    static getBaseAttackContextOptions() {
-        /**@type {import('@client/applications/ux/context-menu.mjs').ContextMenuEntry[]} */
-        return [
-            {
-                label: 'DAGGERHEART.CONFIG.RollTypes.attack.name',
-                icon: 'fa-solid fa-burst',
-                onClick: async (event, target) => (await getDocFromElement(target)).use(event)
-            },
-            {
-                label: 'DAGGERHEART.GENERAL.damage',
-                icon: 'fa-solid fa-explosion',
-                onClick: async (event, target) => {
-                    const doc = await getDocFromElement(target),
-                        action = doc?.system?.attack ?? doc;
-                    const config = action.prepareConfig(event);
-                    config.effects = await game.system.api.data.actions.actionsTypes.base.getEffects(
-                        this.document,
-                        doc
-                    );
-                    config.hasRoll = false;
-                    return action && action.workflow.get('damage').execute(config, null, true);
-                }
-            },
-            {
-                label: 'DAGGERHEART.APPLICATIONS.ContextMenu.sendToChat',
-                icon: 'fa-solid fa-message',
-                onClick: async (_, target) => (await getDocFromElement(target)).toChat(this.document.uuid)
-            }
-        ];
-    }
-
     /* -------------------------------------------- */
     /*  Application Listener Actions                */
     /* -------------------------------------------- */
@@ -377,7 +340,7 @@ export default class DHBaseActorSheet extends DHApplicationMixin(ActorSheetV2) {
                 action: 'update',
                 documentName: 'Item',
                 parent: targetActor,
-                updates: [{ _id: existing.id, 'system.quantity': existing.system.quantity + quantity }]
+                updates: [{ '_id': existing.id, 'system.quantity': existing.system.quantity + quantity }]
             });
         } else {
             const itemsToCreate = [];
@@ -410,7 +373,7 @@ export default class DHBaseActorSheet extends DHApplicationMixin(ActorSheetV2) {
                 action: 'update',
                 documentName: 'Item',
                 parent: originActor,
-                updates: [{ _id: item.id, 'system.quantity': item.system.quantity - quantity }]
+                updates: [{ '_id': item.id, 'system.quantity': item.system.quantity - quantity }]
             });
         }
 
diff --git a/module/applications/sheets/api/item-attachment-sheet.mjs b/module/applications/sheets/api/item-attachment-sheet.mjs
index ea4d5352..bcf2fc3c 100644
--- a/module/applications/sheets/api/item-attachment-sheet.mjs
+++ b/module/applications/sheets/api/item-attachment-sheet.mjs
@@ -29,6 +29,16 @@ export default function ItemAttachmentSheet(Base) {
             }
         };
 
+        async _preparePartContext(partId, context) {
+            await super._preparePartContext(partId, context);
+
+            if (partId === 'attachments') {
+                context.attachedItems = await prepareAttachmentContext(this.document);
+            }
+
+            return context;
+        }
+
         async _onDrop(event) {
             const data = foundry.applications.ux.TextEditor.implementation.getDragEventData(event);
 
diff --git a/module/applications/sidebar/tabs/actorDirectory.mjs b/module/applications/sidebar/tabs/actorDirectory.mjs
index a6f48b54..89da1426 100644
--- a/module/applications/sidebar/tabs/actorDirectory.mjs
+++ b/module/applications/sidebar/tabs/actorDirectory.mjs
@@ -13,8 +13,8 @@ export default class DhActorDirectory extends foundry.applications.sidebar.tabs.
             return document.type === 'adversary'
                 ? game.i18n.localize(adversaryTypes[document.system.type]?.label ?? 'TYPES.Actor.adversary')
                 : document.type === 'environment'
-                    ? game.i18n.localize(environmentTypes[document.system.type]?.label ?? 'TYPES.Actor.environment')
-                    : null;
+                  ? game.i18n.localize(environmentTypes[document.system.type]?.label ?? 'TYPES.Actor.environment')
+                  : null;
         };
     }
 
diff --git a/module/applications/ui/chatLog.mjs b/module/applications/ui/chatLog.mjs
index 199ee87d..7036a5df 100644
--- a/module/applications/ui/chatLog.mjs
+++ b/module/applications/ui/chatLog.mjs
@@ -41,8 +41,8 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
                 const advantage = rollCommand.advantage
                     ? CONFIG.DH.ACTIONS.advantageState.advantage.value
                     : rollCommand.disadvantage
-                        ? CONFIG.DH.ACTIONS.advantageState.disadvantage.value
-                        : undefined;
+                      ? CONFIG.DH.ACTIONS.advantageState.disadvantage.value
+                      : undefined;
                 const difficulty = rollCommand.difficulty;
                 const grantResources = rollCommand.grantResources;
 
@@ -50,8 +50,8 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
                 const title =
                     (flavor ?? traitValue)
                         ? game.i18n.format('DAGGERHEART.UI.Chat.dualityRoll.abilityCheckTitle', {
-                            ability: game.i18n.localize(CONFIG.DH.ACTOR.abilities[traitValue].label)
-                        })
+                              ability: game.i18n.localize(SYSTEM.ACTOR.abilities[traitValue].label)
+                          })
                         : game.i18n.localize('DAGGERHEART.GENERAL.duality');
 
                 enrichedDualityRoll({
diff --git a/module/applications/ui/combatTracker.mjs b/module/applications/ui/combatTracker.mjs
index 25f3e06b..0989bcb8 100644
--- a/module/applications/ui/combatTracker.mjs
+++ b/module/applications/ui/combatTracker.mjs
@@ -84,49 +84,19 @@ export default class DhCombatTracker extends foundry.applications.sidebar.tabs.C
         });
     }
 
-    /**
-     * Open the dialog used to edit the name of the currently viewed Combat encounter.
-     * @this {CombatTracker}
-     * @returns {Promise<void>}
-     */
-    static async #onEditName() {
-        const combat = this.viewed;
-        if (!combat || !game.user.isGM) return null;
-        const field = combat.schema.fields.name;
-        const inputHTML = field.toFormGroup({}, { name: 'name', value: combat.name, autofocus: true }).outerHTML;
-        const formData = await foundry.applications.api.DialogV2.input({
-            window: { icon: 'fa-solid fa-tag', title: 'COMBAT.ACTIONS.EditNameTitle' },
-            position: { width: 480 },
-            content: inputHTML
-        });
-        await combat.update({ name: formData.name || '' });
-    }
-
     _getCombatContextOptions() {
         return [
             {
-                label: 'COMBAT.ACTIONS.EditName',
-                icon: 'fa-solid fa-tag',
+                label: 'COMBAT.ClearMovementHistories',
+                icon: '<i class="fa-solid fa-shoe-prints"></i>',
+                visible: () => game.user.isGM && this.viewed?.combatants.size > 0,
+                callback: () => this.viewed.clearMovementHistories()
+            },
+            {
+                label: 'COMBAT.Delete',
+                icon: '<i class="fa-solid fa-trash"></i>',
                 visible: () => game.user.isGM && !!this.viewed,
-                onClick: () => DhCombatTracker.#onEditName.call(this)
-            },
-            {
-                label: 'COMBAT.ACTIONS.LinkToScene',
-                icon: '<i class="fa-solid fa-link"></i>',
-                visible: () => game.user.isGM && !this.scene,
-                onClick: () => this.viewed.toggleSceneLink()
-            },
-            {
-                label: 'COMBAT.ACTIONS.UnlinkFromScene',
-                icon: '<i class="fa-solid fa-unlink"></i>',
-                visible: () => game.user.isGM && !!this.scene,
-                onClick: () => this.viewed.toggleSceneLink()
-            },
-            {
-                label: 'COMBAT.End',
-                icon: 'fa-solid fa-xmark',
-                visible: () => game.user.isGM && !!this.viewed,
-                onClick: () => this.viewed.endCombat()
+                callback: () => this.viewed.endCombat()
             }
         ];
     }
@@ -163,7 +133,7 @@ export default class DhCombatTracker extends foundry.applications.sidebar.tabs.C
             canPing: combatant.sceneId === canvas.scene?.id && game.user.hasPermission('PING_CANVAS'),
             type: combatant.actor?.system?.type,
             img: await this._getCombatantThumbnail(combatant),
-            disposition: combatant.token?.disposition
+            disposition: combatant.token.disposition
         };
 
         turn.css = [turn.active ? 'active' : null, hidden ? 'hide' : null, isDefeated ? 'defeated' : null].filterJoin(
diff --git a/module/applications/ui/countdownEdit.mjs b/module/applications/ui/countdownEdit.mjs
index 5974e1f2..b418107c 100644
--- a/module/applications/ui/countdownEdit.mjs
+++ b/module/applications/ui/countdownEdit.mjs
@@ -56,8 +56,8 @@ export default class CountdownEdit extends HandlebarsApplicationMixin(Applicatio
                 ? countdown.progress.looping === CONFIG.DH.GENERAL.countdownLoopingTypes.increasing.id
                     ? 'DAGGERHEART.UI.Countdowns.increasingLoop'
                     : countdown.progress.looping === CONFIG.DH.GENERAL.countdownLoopingTypes.decreasing.id
-                        ? 'DAGGERHEART.UI.Countdowns.decreasingLoop'
-                        : 'DAGGERHEART.UI.Countdowns.loop'
+                      ? 'DAGGERHEART.UI.Countdowns.decreasingLoop'
+                      : 'DAGGERHEART.UI.Countdowns.loop'
                 : null;
             const randomizeValid = !new Roll(countdown.progress.startFormula ?? '').isDeterministic;
             acc[key] = {
@@ -148,11 +148,11 @@ export default class CountdownEdit extends HandlebarsApplicationMixin(Applicatio
     }
 
     async gmSetSetting(data) {
-        await game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Countdowns, data);
-        game.socket.emit(`system.${CONFIG.DH.id}`, {
-            action: socketEvent.Refresh,
-            data: { refreshType: RefreshType.Countdown }
-        });
+        await game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Countdowns, data),
+            game.socket.emit(`system.${CONFIG.DH.id}`, {
+                action: socketEvent.Refresh,
+                data: { refreshType: RefreshType.Countdown }
+            });
         Hooks.callAll(socketEvent.Refresh, { refreshType: RefreshType.Countdown });
     }
 
diff --git a/module/applications/ui/countdowns.mjs b/module/applications/ui/countdowns.mjs
index 2a2a113e..76e2b399 100644
--- a/module/applications/ui/countdowns.mjs
+++ b/module/applications/ui/countdowns.mjs
@@ -31,9 +31,9 @@ export default class DhCountdowns extends HandlebarsApplicationMixin(Application
             minimizable: false
         },
         actions: {
-            toggleViewMode: DhCountdowns.#onToggleViewMode,
-            editCountdowns: DhCountdowns.#onEditCountdowns,
-            loopCountdown: DhCountdowns.#onLoopCountdown,
+            toggleViewMode: DhCountdowns.#toggleViewMode,
+            editCountdowns: DhCountdowns.#editCountdowns,
+            loopCountdown: DhCountdowns.#loopCountdown,
             decreaseCountdown: (_, target) => this.editCountdown(false, target),
             increaseCountdown: (_, target) => this.editCountdown(true, target)
         },
@@ -101,8 +101,8 @@ export default class DhCountdowns extends HandlebarsApplicationMixin(Application
                 ? countdown.progress.looping === CONFIG.DH.GENERAL.countdownLoopingTypes.increasing.id
                     ? 'DAGGERHEART.UI.Countdowns.increasingLoop'
                     : countdown.progress.looping === CONFIG.DH.GENERAL.countdownLoopingTypes.decreasing.id
-                        ? 'DAGGERHEART.UI.Countdowns.decreasingLoop'
-                        : 'DAGGERHEART.UI.Countdowns.loop'
+                      ? 'DAGGERHEART.UI.Countdowns.decreasingLoop'
+                      : 'DAGGERHEART.UI.Countdowns.loop'
                 : null;
             const loopDisabled =
                 !countdownEditable ||
@@ -147,7 +147,7 @@ export default class DhCountdowns extends HandlebarsApplicationMixin(Application
         return true;
     }
 
-    static async #onToggleViewMode() {
+    static async #toggleViewMode() {
         const currentMode = game.user.getFlag(CONFIG.DH.id, CONFIG.DH.FLAGS.userFlags.countdownMode);
         const appMode = CONFIG.DH.GENERAL.countdownAppMode;
         const newMode = currentMode === appMode.textIcon ? appMode.iconOnly : appMode.textIcon;
@@ -158,16 +158,15 @@ export default class DhCountdowns extends HandlebarsApplicationMixin(Application
         this.render();
     }
 
-    static async #onEditCountdowns() {
+    static async #editCountdowns() {
         new game.system.api.applications.ui.CountdownEdit().render(true);
     }
 
-    static async #onLoopCountdown(_, target) {
+    static async #loopCountdown(_, target) {
         if (!DhCountdowns.canPerformEdit()) return;
 
         const settings = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Countdowns);
-        const countdownId = target.closest('[data-countdown]').dataset.countdown;
-        const countdown = settings.countdowns[countdownId];
+        const countdown = settings.countdowns[target.id];
 
         let progressMax = countdown.progress.start;
         let message = null;
@@ -181,12 +180,12 @@ export default class DhCountdowns extends HandlebarsApplicationMixin(Application
             countdown.progress.looping === CONFIG.DH.GENERAL.countdownLoopingTypes.increasing.id
                 ? Number(progressMax) + 1
                 : countdown.progress.looping === CONFIG.DH.GENERAL.countdownLoopingTypes.decreasing.id
-                    ? Math.max(Number(progressMax) - 1, 0)
-                    : progressMax;
+                  ? Math.max(Number(progressMax) - 1, 0)
+                  : progressMax;
 
         await waitForDiceSoNice(message);
         await settings.updateSource({
-            [`countdowns.${countdownId}.progress`]: {
+            [`countdowns.${target.id}.progress`]: {
                 current: newMax,
                 start: newMax
             }
@@ -200,23 +199,22 @@ export default class DhCountdowns extends HandlebarsApplicationMixin(Application
         if (!DhCountdowns.canPerformEdit()) return;
 
         const settings = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Countdowns);
-        const countdownId = target.closest('[data-countdown]').dataset.countdown;
-        const countdown = settings.countdowns[countdownId];
+        const countdown = settings.countdowns[target.id];
         const newCurrent = increase
             ? Math.min(countdown.progress.current + 1, countdown.progress.start)
             : Math.max(countdown.progress.current - 1, 0);
-        await settings.updateSource({ [`countdowns.${countdownId}.progress.current`]: newCurrent });
+        await settings.updateSource({ [`countdowns.${target.id}.progress.current`]: newCurrent });
         await emitGMUpdate(GMUpdateEvent.UpdateCountdowns, DhCountdowns.gmSetSetting.bind(settings), settings, null, {
             refreshType: RefreshType.Countdown
         });
     }
 
     static async gmSetSetting(data) {
-        await game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Countdowns, data);
-        game.socket.emit(`system.${CONFIG.DH.id}`, {
-            action: socketEvent.Refresh,
-            data: { refreshType: RefreshType.Countdown }
-        });
+        await game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Countdowns, data),
+            game.socket.emit(`system.${CONFIG.DH.id}`, {
+                action: socketEvent.Refresh,
+                data: { refreshType: RefreshType.Countdown }
+            });
         Hooks.callAll(socketEvent.Refresh, { refreshType: RefreshType.Countdown });
     }
 
diff --git a/module/applications/ui/effectsDisplay.mjs b/module/applications/ui/effectsDisplay.mjs
index a64b1b22..035041e1 100644
--- a/module/applications/ui/effectsDisplay.mjs
+++ b/module/applications/ui/effectsDisplay.mjs
@@ -67,10 +67,10 @@ export default class DhEffectsDisplay extends HandlebarsApplicationMixin(Applica
         const actor = token
             ? token.actor
             : canvas.tokens.controlled.length === 0
-                ? !game.user.isGM
-                    ? game.user.character
-                    : null
-                : canvas.tokens.controlled[0].actor;
+              ? !game.user.isGM
+                  ? game.user.character
+                  : null
+              : canvas.tokens.controlled[0].actor;
         return getIconVisibleActiveEffects(actor?.getActiveEffects() ?? []);
     };
 
diff --git a/module/canvas/placeables/token.mjs b/module/canvas/placeables/token.mjs
index 02eed7db..68e325c2 100644
--- a/module/canvas/placeables/token.mjs
+++ b/module/canvas/placeables/token.mjs
@@ -155,15 +155,15 @@ export default class DhTokenPlaceable extends foundry.canvas.placeables.Token {
         const targetEdge = this.#getEdgeBoundary(targetBounds, originPoint, targetPoint);
         const adjustedOriginPoint = originEdge
             ? canvas.grid.getTopLeftPoint({
-                x: originEdge.x + Math.sign(originPoint.x - originEdge.x),
-                y: originEdge.y + Math.sign(originPoint.y - originEdge.y)
-            })
+                  x: originEdge.x + Math.sign(originPoint.x - originEdge.x),
+                  y: originEdge.y + Math.sign(originPoint.y - originEdge.y)
+              })
             : originPoint;
         const adjustDestinationPoint = targetEdge
             ? canvas.grid.getTopLeftPoint({
-                x: targetEdge.x + Math.sign(targetPoint.x - targetEdge.x),
-                y: targetEdge.y + Math.sign(targetPoint.y - targetEdge.y)
-            })
+                  x: targetEdge.x + Math.sign(targetPoint.x - targetEdge.x),
+                  y: targetEdge.y + Math.sign(targetPoint.y - targetEdge.y)
+              })
             : targetPoint;
         const distance = canvas.grid.measurePath([
             { ...adjustedOriginPoint, elevation: 0 },
diff --git a/module/config/itemBrowserConfig.mjs b/module/config/itemBrowserConfig.mjs
index 83572dc0..ae5fa71b 100644
--- a/module/config/itemBrowserConfig.mjs
+++ b/module/config/itemBrowserConfig.mjs
@@ -127,8 +127,8 @@ export const typeConfig = {
                     isSecondary
                         ? 'DAGGERHEART.ITEMS.Weapon.secondaryWeapon.short'
                         : isSecondary === false
-                            ? 'DAGGERHEART.ITEMS.Weapon.primaryWeapon.short'
-                            : '-'
+                          ? 'DAGGERHEART.ITEMS.Weapon.primaryWeapon.short'
+                          : '-'
             },
             {
                 key: 'system.tier',
diff --git a/module/data/action/attackAction.mjs b/module/data/action/attackAction.mjs
index 1988b1d8..c4d07c25 100644
--- a/module/data/action/attackAction.mjs
+++ b/module/data/action/attackAction.mjs
@@ -75,12 +75,7 @@ export default class DHAttackAction extends DHDamageAction {
         const useAltDamage = this.actor?.effects?.find(x => x.type === 'horde')?.active;
         for (const { value, valueAlt, type } of damage.parts) {
             const usedValue = useAltDamage ? valueAlt : value;
-            const damageString = Roll.replaceFormulaData(usedValue.getFormula(), this.actor?.getRollData() ?? {});
-            const str = damageString
-                ? damageString
-                : game.i18n.format('DAGGERHEART.GENERAL.missingX', {
-                    x: game.i18n.localize('DAGGERHEART.GENERAL.damage')
-                });
+            const str = Roll.replaceFormulaData(usedValue.getFormula(), this.actor?.getRollData() ?? {});
 
             const icons = Array.from(type)
                 .map(t => CONFIG.DH.GENERAL.damageTypes[t]?.icon)
diff --git a/module/data/action/baseAction.mjs b/module/data/action/baseAction.mjs
index c71f5ef9..acd104a7 100644
--- a/module/data/action/baseAction.mjs
+++ b/module/data/action/baseAction.mjs
@@ -144,8 +144,8 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
         return this.item instanceof DhpActor
             ? this.item
             : this.item?.parent instanceof DhpActor
-                ? this.item.parent
-                : null;
+              ? this.item.parent
+              : null;
     }
 
     /**
@@ -223,7 +223,7 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
      * @returns {object}
      */
     async use(event, configOptions = {}) {
-        if (!this.actor) throw new Error('An Action can\'t be used outside of an Actor context.');
+        if (!this.actor) throw new Error("An Action can't be used outside of an Actor context.");
 
         let config = this.prepareConfig(event, configOptions);
         if (!config) return;
@@ -300,17 +300,17 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
 
             const groupAttackTokens = this.damage.groupAttack
                 ? game.system.api.fields.ActionFields.DamageField.getGroupAttackTokens(
-                    this.actor.id,
-                    this.damage.groupAttack
-                )
+                      this.actor.id,
+                      this.damage.groupAttack
+                  )
                 : null;
 
             config.damageOptions = {
                 groupAttack: this.damage.groupAttack
                     ? {
-                        numAttackers: Math.max(groupAttackTokens.length, 1),
-                        range: this.damage.groupAttack
-                    }
+                          numAttackers: Math.max(groupAttackTokens.length, 1),
+                          range: this.damage.groupAttack
+                      }
                     : null
             };
         }
diff --git a/module/data/action/countdownAction.mjs b/module/data/action/countdownAction.mjs
index cb141637..abcc6b40 100644
--- a/module/data/action/countdownAction.mjs
+++ b/module/data/action/countdownAction.mjs
@@ -36,7 +36,7 @@ export default class DhCountdownAction extends DHBaseAction {
 
     /** @inheritDoc */
     static migrateData(source) {
-        for (const countdown of Object.values(source.countdown)) {
+        for (const countdown of source.countdown) {
             if (countdown.progress.max) {
                 countdown.progress.startFormula = countdown.progress.max;
                 countdown.progress.start = 1;
diff --git a/module/data/activeEffect/beastformEffect.mjs b/module/data/activeEffect/beastformEffect.mjs
index 7e037f5b..0fbea122 100644
--- a/module/data/activeEffect/beastformEffect.mjs
+++ b/module/data/activeEffect/beastformEffect.mjs
@@ -90,13 +90,13 @@ export default class BeastformEffect extends BaseEffect {
                     ...baseUpdate,
                     x,
                     y,
-                    texture: {
+                    'texture': {
                         enabled: this.characterTokenData.usesDynamicToken,
                         src: token.flags.daggerheart?.beastformTokenImg ?? this.characterTokenData.tokenImg,
                         scaleX: this.characterTokenData.tokenSize.scale,
                         scaleY: this.characterTokenData.tokenSize.scale
                     },
-                    ring: {
+                    'ring': {
                         subject: {
                             texture:
                                 token.flags.daggerheart?.beastformSubjectTexture ?? this.characterTokenData.tokenRingImg
diff --git a/module/data/activeEffect/changeTypes/armor.mjs b/module/data/activeEffect/changeTypes/armor.mjs
index 0c226513..217ff9dd 100644
--- a/module/data/activeEffect/changeTypes/armor.mjs
+++ b/module/data/activeEffect/changeTypes/armor.mjs
@@ -166,10 +166,10 @@ export default class ArmorChange extends foundry.abstract.DataModel {
                 value:
                     change.type === 'armor'
                         ? {
-                            ...change.value,
-                            current: Math.min(change.value.current, newMax),
-                            max: newMax
-                        }
+                              ...change.value,
+                              current: Math.min(change.value.current, newMax),
+                              max: newMax
+                          }
                         : change.value
             }))
         ];
diff --git a/module/data/actor/character.mjs b/module/data/actor/character.mjs
index aed27650..10d53c13 100644
--- a/module/data/actor/character.mjs
+++ b/module/data/actor/character.mjs
@@ -315,8 +315,8 @@ export default class DhCharacter extends DhCreature {
         return currentLevel === 1
             ? 1
             : Object.values(game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.LevelTiers).tiers).find(
-                tier => currentLevel >= tier.levels.start && currentLevel <= tier.levels.end
-            ).tier;
+                  tier => currentLevel >= tier.levels.start && currentLevel <= tier.levels.end
+              ).tier;
     }
 
     get ancestry() {
@@ -520,20 +520,20 @@ export default class DhCharacter extends DhCreature {
 
             if (armorSource.type === 'armor') {
                 armorUpdates[armorSource.parent.id].updates.push({
-                    _id: armorSource.id,
+                    '_id': armorSource.id,
                     'system.armor.current': armorSource.system.armor.current + usedArmorChange
                 });
             } else {
                 effectUpdates[armorSource.parent.id].updates.push({
-                    _id: armorSource.id,
+                    '_id': armorSource.id,
                     'system.changes': armorSource.system.changes.map(change => ({
                         ...change,
                         value:
                             change.type === 'armor'
                                 ? {
-                                    ...change.value,
-                                    current: armorSource.system.armorChange.value.current + usedArmorChange
-                                }
+                                      ...change.value,
+                                      current: armorSource.system.armorChange.value.current + usedArmorChange
+                                  }
                                 : change.value
                     }))
                 });
@@ -621,21 +621,21 @@ export default class DhCharacter extends DhCreature {
             },
             ...(multiclassFeatures.length
                 ? {
-                    multiclassFeatures: {
-                        title: `${game.i18n.localize('DAGGERHEART.GENERAL.multiclass')} - ${this.multiclass.value?.name}`,
-                        type: 'multiclass',
-                        values: multiclassFeatures
-                    }
-                }
+                      multiclassFeatures: {
+                          title: `${game.i18n.localize('DAGGERHEART.GENERAL.multiclass')} - ${this.multiclass.value?.name}`,
+                          type: 'multiclass',
+                          values: multiclassFeatures
+                      }
+                  }
                 : {}),
             ...(multiclassSubclassFeatures.length
                 ? {
-                    multiclassSubclassFeatures: {
-                        title: `${game.i18n.localize('DAGGERHEART.GENERAL.multiclass')} ${game.i18n.localize('TYPES.Item.subclass')} - ${this.multiclass.subclass?.name}`,
-                        type: 'multiclassSubclass',
-                        values: multiclassSubclassFeatures
-                    }
-                }
+                      multiclassSubclassFeatures: {
+                          title: `${game.i18n.localize('DAGGERHEART.GENERAL.multiclass')} ${game.i18n.localize('TYPES.Item.subclass')} - ${this.multiclass.subclass?.name}`,
+                          type: 'multiclassSubclass',
+                          values: multiclassSubclassFeatures
+                      }
+                  }
                 : {}),
             companionFeatures: {
                 title: game.i18n.localize('DAGGERHEART.ACTORS.Character.companionFeatures'),
@@ -659,8 +659,8 @@ export default class DhCharacter extends DhCreature {
             (this.primaryWeapon && this.secondaryWeapon)
             ? burden.twoHanded.value
             : this.primaryWeapon || this.secondaryWeapon
-                ? burden.oneHanded.value
-                : null;
+              ? burden.oneHanded.value
+              : null;
     }
 
     get deathMoveViable() {
@@ -726,8 +726,8 @@ export default class DhCharacter extends DhCreature {
             currentLevel === 1
                 ? null
                 : Object.values(game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.LevelTiers).tiers).find(
-                    tier => currentLevel >= tier.levels.start && currentLevel <= tier.levels.end
-                ).tier;
+                      tier => currentLevel >= tier.levels.start && currentLevel <= tier.levels.end
+                  ).tier;
         if (game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation).levelupAuto) {
             for (let levelKey in this.levelData.levelups) {
                 const level = this.levelData.levelups[levelKey];
diff --git a/module/data/actor/tierAdjustment.mjs b/module/data/actor/tierAdjustment.mjs
index bc6ad176..785eec2b 100644
--- a/module/data/actor/tierAdjustment.mjs
+++ b/module/data/actor/tierAdjustment.mjs
@@ -1,6 +1,5 @@
 import { calculateExpectedValue, parseTermsFromSimpleFormula } from '../../helpers/utils.mjs';
 import { adversaryExpectedDamage, adversaryScalingData } from '../../config/actorConfig.mjs';
-import { parseInlineParams } from '../../enrichers/parser.mjs';
 
 export function getTierAdjustedAdversary(source, tier) {
     const currentTier = source.tier ?? 1;
@@ -61,8 +60,8 @@ export function getTierAdjustedAdversary(source, tier) {
         const descriptionFormulas = [];
         for (const withDescription of [item.system, ...Object.values(item.system.actions)]) {
             withDescription.description = withDescription.description.replace(damageRegex, (match, inner) => {
-                const { value: formula } = parseInlineParams(inner, { first: 'value' });
-                if (!formula) return match;
+                const { value: formula } = parseInlineParams(inner);
+                if (!formula || !type) return match;
 
                 try {
                     const newFormula = calculateAdjustedDamage(formula, 'action', damageMeta)?.formula;
diff --git a/module/data/companionLevelup.mjs b/module/data/companionLevelup.mjs
index e24820de..7ab61210 100644
--- a/module/data/companionLevelup.mjs
+++ b/module/data/companionLevelup.mjs
@@ -22,12 +22,12 @@ export class DhCompanionLevelup extends foundry.abstract.DataModel {
                     const initialAchievements = i === tier.levels.start ? tier.initialAchievements : {};
                     const experiences = initialAchievements.experience
                         ? [...Array(initialAchievements.experience.nr).keys()].reduce((acc, _) => {
-                            acc[foundry.utils.randomID()] = {
-                                name: '',
-                                modifier: initialAchievements.experience.modifier
-                            };
-                            return acc;
-                        }, {})
+                              acc[foundry.utils.randomID()] = {
+                                  name: '',
+                                  modifier: initialAchievements.experience.modifier
+                              };
+                              return acc;
+                          }, {})
                         : {};
 
                     const currentChoices = pcLevelData.levelups[i]?.selections?.length;
@@ -302,9 +302,9 @@ export class DhLevelupLevel extends foundry.abstract.DataModel {
                 experiences: levelData.achievements?.experiences ?? achievements.experiences ?? {},
                 domainCards: levelData.achievements?.domainCards
                     ? levelData.achievements.domainCards.reduce((acc, card, index) => {
-                        acc[index] = { ...card };
-                        return acc;
-                    }, {})
+                          acc[index] = { ...card };
+                          return acc;
+                      }, {})
                     : (achievements.domainCards ?? {}),
                 proficiency: levelData.achievements?.proficiency ?? achievements.proficiency ?? null
             },
diff --git a/module/data/countdowns.mjs b/module/data/countdowns.mjs
index 54971d34..7d27197d 100644
--- a/module/data/countdowns.mjs
+++ b/module/data/countdowns.mjs
@@ -77,11 +77,11 @@ export class DhCountdown extends foundry.abstract.DataModel {
     static defaultCountdown(type, playerHidden) {
         const ownership = playerHidden
             ? game.users.reduce((acc, user) => {
-                if (!user.isGM) {
-                    acc[user.id] = CONST.DOCUMENT_OWNERSHIP_LEVELS.NONE;
-                }
-                return acc;
-            }, {})
+                  if (!user.isGM) {
+                      acc[user.id] = CONST.DOCUMENT_OWNERSHIP_LEVELS.NONE;
+                  }
+                  return acc;
+              }, {})
             : undefined;
 
         return {
@@ -102,8 +102,8 @@ export class DhCountdown extends foundry.abstract.DataModel {
                 value: user.isGM
                     ? CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER
                     : this.ownership.players[user.id] && this.ownership.players[user.id].type !== -1
-                        ? this.ownership.players[user.id].type
-                        : this.ownership.default,
+                      ? this.ownership.players[user.id].type
+                      : this.ownership.default,
                 isGM: user.isGM
             };
 
diff --git a/module/data/fields/action/beastformField.mjs b/module/data/fields/action/beastformField.mjs
index 0eeb95c2..e3be9937 100644
--- a/module/data/fields/action/beastformField.mjs
+++ b/module/data/fields/action/beastformField.mjs
@@ -105,8 +105,8 @@ export default class BeastformField extends fields.SchemaField {
                 baseSize === 'custom'
                     ? 'custom'
                     : (Object.keys(CONFIG.DH.ACTOR.tokenSize).find(
-                        x => CONFIG.DH.ACTOR.tokenSize[x].value === CONFIG.DH.ACTOR.tokenSize[baseSize].value + 1
-                    ) ?? baseSize);
+                          x => CONFIG.DH.ACTOR.tokenSize[x].value === CONFIG.DH.ACTOR.tokenSize[baseSize].value + 1
+                      ) ?? baseSize);
             formData.system.tokenSize = {
                 ...evolvedData.form.system.tokenSize,
                 size: evolvedSize
diff --git a/module/data/fields/action/costField.mjs b/module/data/fields/action/costField.mjs
index 82cfcd23..1928af41 100644
--- a/module/data/fields/action/costField.mjs
+++ b/module/data/fields/action/costField.mjs
@@ -116,8 +116,8 @@ export default class CostField extends fields.ArrayField {
                 c.key === 'fear'
                     ? game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Resources.Fear)
                     : resources[c.key].isReversed
-                        ? resources[c.key].max - resources[c.key].value
-                        : resources[c.key].value;
+                      ? resources[c.key].max - resources[c.key].value
+                      : resources[c.key].value;
             if (c.scalable) c.maxStep = Math.floor((c.max - c.value) / c.step);
             return c;
         });
@@ -149,8 +149,8 @@ export default class CostField extends fields.ArrayField {
                 !resources[c.key]
                     ? a
                     : a && resources[c.key].isReversed
-                        ? resources[c.key].value + (c.total ?? c.value) <= resources[c.key].max
-                        : resources[c.key]?.value >= (c.total ?? c.value),
+                      ? resources[c.key].value + (c.total ?? c.value) <= resources[c.key].max
+                      : resources[c.key]?.value >= (c.total ?? c.value),
             true
         );
     }
diff --git a/module/data/fields/action/countdownField.mjs b/module/data/fields/action/countdownField.mjs
index 96d9dd91..990f8ef1 100644
--- a/module/data/fields/action/countdownField.mjs
+++ b/module/data/fields/action/countdownField.mjs
@@ -87,11 +87,11 @@ export default class CountdownField extends fields.ArrayField {
                     CONFIG.DH.id,
                     CONFIG.DH.SETTINGS.gameSettings.Countdowns,
                     countdownSetting.toObject()
-                );
-                game.socket.emit(`system.${CONFIG.DH.id}`, {
-                    action: socketEvent.Refresh,
-                    data: { refreshType: RefreshType.Countdown }
-                });
+                ),
+                    game.socket.emit(`system.${CONFIG.DH.id}`, {
+                        action: socketEvent.Refresh,
+                        data: { refreshType: RefreshType.Countdown }
+                    });
                 Hooks.callAll(socketEvent.Refresh, { refreshType: RefreshType.Countdown });
             },
             data,
diff --git a/module/data/fields/action/effectsField.mjs b/module/data/fields/action/effectsField.mjs
index e943d63d..d2ee1682 100644
--- a/module/data/fields/action/effectsField.mjs
+++ b/module/data/fields/action/effectsField.mjs
@@ -61,11 +61,11 @@ export default class EffectsField extends fields.ArrayField {
                 token: messageToken,
                 conditionImmunities: Object.values(conditionImmunities).some(x => x)
                     ? game.i18n.format('DAGGERHEART.UI.Chat.effectSummary.immunityTo', {
-                        immunities: Object.keys(conditionImmunities)
-                            .filter(x => conditionImmunities[x])
-                            .map(x => game.i18n.localize(conditions[x].name))
-                            .join(', ')
-                    })
+                          immunities: Object.keys(conditionImmunities)
+                              .filter(x => conditionImmunities[x])
+                              .map(x => game.i18n.localize(conditions[x].name))
+                              .join(', ')
+                      })
                     : null
             });
 
diff --git a/module/data/fields/action/saveField.mjs b/module/data/fields/action/saveField.mjs
index 7343ab85..0629353e 100644
--- a/module/data/fields/action/saveField.mjs
+++ b/module/data/fields/action/saveField.mjs
@@ -69,11 +69,11 @@ export default class SaveField extends fields.SchemaField {
                                 game.user === actor.owner
                                     ? SaveField.rollSave.call(this, actor, event)
                                     : actor.owner.query('reactionRoll', {
-                                        actionId: this.uuid,
-                                        actorId: actor.uuid,
-                                        event,
-                                        message
-                                    });
+                                          actionId: this.uuid,
+                                          actorId: actor.uuid,
+                                          event,
+                                          message
+                                      });
                             const result = await rollSave;
                             await SaveField.updateSaveMessage.call(this, result, message, target.id);
                             subResolve();
@@ -97,8 +97,8 @@ export default class SaveField extends fields.SchemaField {
         const title = actor.isNPC
                 ? game.i18n.localize('DAGGERHEART.GENERAL.reactionRoll')
                 : game.i18n.format('DAGGERHEART.UI.Chat.dualityRoll.abilityCheckTitle', {
-                    ability: game.i18n.localize(abilities[this.save.trait]?.label)
-                }),
+                      ability: game.i18n.localize(abilities[this.save.trait]?.label)
+                  }),
             rollConfig = {
                 event,
                 title,
diff --git a/module/data/item/ancestry.mjs b/module/data/item/ancestry.mjs
index eae1136c..b9253a3c 100644
--- a/module/data/item/ancestry.mjs
+++ b/module/data/item/ancestry.mjs
@@ -1,6 +1,6 @@
 import BaseDataItem from './base.mjs';
 import ItemLinkFields from '../../data/fields/itemLinkFields.mjs';
-import { fromUuids, getFeaturesHTMLData } from '../../helpers/utils.mjs';
+import { getFeaturesHTMLData } from '../../helpers/utils.mjs';
 
 export default class DHAncestry extends BaseDataItem {
     /** @inheritDoc */
@@ -45,10 +45,6 @@ export default class DHAncestry extends BaseDataItem {
 
     /**@inheritdoc */
     async getDescriptionData() {
-        // Preload all ancestry features for acquisition from the cache
-        // todo: make feature acquisition async and replace feature helpers for methods
-        await fromUuids(this._source.features.map(f => f.item));
-
         const baseDescription = this.description;
         const features = await getFeaturesHTMLData(this.features);
 
diff --git a/module/data/item/beastform.mjs b/module/data/item/beastform.mjs
index ba274cc7..ee9d9839 100644
--- a/module/data/item/beastform.mjs
+++ b/module/data/item/beastform.mjs
@@ -208,8 +208,8 @@ export default class DHBeastform extends BaseDataItem {
         const autoTokenSize =
             this.tokenSize.size !== 'custom'
                 ? game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).tokenSizes[
-                    this.tokenSize.size
-                ]
+                      this.tokenSize.size
+                  ]
                 : null;
         const width = autoTokenSize ?? this.tokenSize.width;
         const height = autoTokenSize ?? this.tokenSize.height;
diff --git a/module/data/item/community.mjs b/module/data/item/community.mjs
index 6f4470b8..6d054976 100644
--- a/module/data/item/community.mjs
+++ b/module/data/item/community.mjs
@@ -1,4 +1,4 @@
-import { fromUuids, getFeaturesHTMLData } from '../../helpers/utils.mjs';
+import { getFeaturesHTMLData } from '../../helpers/utils.mjs';
 import ForeignDocumentUUIDArrayField from '../fields/foreignDocumentUUIDArrayField.mjs';
 import BaseDataItem from './base.mjs';
 
@@ -27,10 +27,6 @@ export default class DHCommunity extends BaseDataItem {
 
     /**@inheritdoc */
     async getDescriptionData() {
-        // Preload all community features for acquisition from the cache
-        // todo: make feature acquisition async and replace feature helpers for methods
-        await fromUuids(this._source.features);
-
         const baseDescription = this.description;
         const features = await getFeaturesHTMLData(this.features);
 
diff --git a/module/data/item/subclass.mjs b/module/data/item/subclass.mjs
index 934b55d3..55b078c2 100644
--- a/module/data/item/subclass.mjs
+++ b/module/data/item/subclass.mjs
@@ -91,7 +91,7 @@ export default class DHSubclass extends BaseDataItem {
             ? game.i18n.localize(CONFIG.DH.ACTOR.abilities[this.spellcastingTrait].label)
             : null;
 
-        // Preload all subclass features for acquisition from the cache
+        // Preload all class features for acquisition from the cache
         // todo: make feature acquisition async and replace feature helpers for methods
         await fromUuids(this._source.features.map(f => f.item));
 
diff --git a/module/data/levelup.mjs b/module/data/levelup.mjs
index e30bf52d..4dc1c058 100644
--- a/module/data/levelup.mjs
+++ b/module/data/levelup.mjs
@@ -19,12 +19,12 @@ export class DhLevelup extends foundry.abstract.DataModel {
                     const initialAchievements = i === tier.levels.start ? tier.initialAchievements : {};
                     const experiences = initialAchievements.experience
                         ? [...Array(initialAchievements.experience.nr).keys()].reduce((acc, _) => {
-                            acc[foundry.utils.randomID()] = {
-                                name: '',
-                                modifier: initialAchievements.experience.modifier
-                            };
-                            return acc;
-                        }, {})
+                              acc[foundry.utils.randomID()] = {
+                                  name: '',
+                                  modifier: initialAchievements.experience.modifier
+                              };
+                              return acc;
+                          }, {})
                         : {};
 
                     const domainCards = [...Array(tier.domainCardByLevel).keys()].reduce((acc, _) => {
@@ -298,9 +298,9 @@ export class DhLevelupLevel extends foundry.abstract.DataModel {
                 experiences: levelData.achievements?.experiences ?? achievements.experiences ?? {},
                 domainCards: levelData.achievements?.domainCards
                     ? levelData.achievements.domainCards.reduce((acc, card, index) => {
-                        acc[index] = { ...card };
-                        return acc;
-                    }, {})
+                          acc[index] = { ...card };
+                          return acc;
+                      }, {})
                     : (achievements.domainCards ?? {}),
                 proficiency: levelData.achievements?.proficiency ?? achievements.proficiency ?? null
             },
diff --git a/module/dice/dhRoll.mjs b/module/dice/dhRoll.mjs
index c28db98f..02c4ab24 100644
--- a/module/dice/dhRoll.mjs
+++ b/module/dice/dhRoll.mjs
@@ -37,7 +37,6 @@ export default class DHRoll extends Roll {
     static async buildConfigure(config = {}, message = {}) {
         config.hooks = [...this.getHooks(), ''];
         config.dialog ??= {};
-        config.damageOptions ??= {};
 
         for (const hook of config.hooks) {
             if (Hooks.call(`${CONFIG.DH.id}.preRoll${hook.capitalize()}`, config, message) === false) return null;
@@ -104,9 +103,9 @@ export default class DHRoll extends Roll {
         if (action?.chatDisplay) {
             actionDescription = action
                 ? await foundry.applications.ux.TextEditor.implementation.enrichHTML(action.description, {
-                    relativeTo: config.data,
-                    rollData: config.data.getRollData?.() ?? {}
-                })
+                      relativeTo: config.data,
+                      rollData: config.data.getRollData?.() ?? {}
+                  })
                 : null;
             config.actionChatMessageHandled = true;
         }
diff --git a/module/dice/dualityRoll.mjs b/module/dice/dualityRoll.mjs
index 1cfed094..1d2d556a 100644
--- a/module/dice/dualityRoll.mjs
+++ b/module/dice/dualityRoll.mjs
@@ -109,10 +109,10 @@ export default class DualityRoll extends D20Roll {
         const label = this.guaranteedCritical
             ? 'DAGGERHEART.GENERAL.guaranteedCriticalSuccess'
             : this.isCritical
-                ? 'DAGGERHEART.GENERAL.criticalSuccess'
-                : this.withHope
-                    ? 'DAGGERHEART.GENERAL.hope'
-                    : 'DAGGERHEART.GENERAL.fear';
+              ? 'DAGGERHEART.GENERAL.criticalSuccess'
+              : this.withHope
+                ? 'DAGGERHEART.GENERAL.hope'
+                : 'DAGGERHEART.GENERAL.fear';
 
         return game.i18n.localize(label);
     }
@@ -147,8 +147,8 @@ export default class DualityRoll extends D20Roll {
         const advDieClass = this.hasAdvantage
             ? game.system.api.dice.diceTypes.AdvantageDie
             : this.hasDisadvantage
-                ? game.system.api.dice.diceTypes.DisadvantageDie
-                : null;
+              ? game.system.api.dice.diceTypes.DisadvantageDie
+              : null;
         if (advDieClass) {
             const advDie = new advDieClass({ faces: this.advantageFaces, number: this.advantageNumber });
             if (this.terms.length < 4) {
diff --git a/module/dice/helpers.mjs b/module/dice/helpers.mjs
index 35adb8b7..33519949 100644
--- a/module/dice/helpers.mjs
+++ b/module/dice/helpers.mjs
@@ -1,5 +1,3 @@
-import { ResourceUpdateMap } from '../data/action/baseAction.mjs';
-
 export function updateResourcesForDualityReroll(oldDuality, newDuality, actor) {
     const { hopeFear } = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation);
     if (game.user.isGM ? !hopeFear.gm : !hopeFear.players) return;
diff --git a/module/documents/activeEffect.mjs b/module/documents/activeEffect.mjs
index 3518210b..f9239a90 100644
--- a/module/documents/activeEffect.mjs
+++ b/module/documents/activeEffect.mjs
@@ -175,8 +175,8 @@ export default class DhActiveEffect extends foundry.documents.ActiveEffect {
         return model instanceof documentClass
             ? model
             : model.parent
-                ? this.#resolveParentDocument(model.parent, documentClass)
-                : null;
+              ? this.#resolveParentDocument(model.parent, documentClass)
+              : null;
     }
 
     static getChangeValue(model, change, effect) {
diff --git a/module/documents/actor.mjs b/module/documents/actor.mjs
index fb10435f..6c462d98 100644
--- a/module/documents/actor.mjs
+++ b/module/documents/actor.mjs
@@ -65,11 +65,6 @@ export default class DhpActor extends Actor {
         };
     }
 
-    static createDialog(data, createOptions, options, renderOptions) {
-        options.classes = [options.classes ?? [], 'actor-create'].flat(); // handled in hook
-        return super.createDialog(data, createOptions, options, renderOptions);
-    }
-
     /* -------------------------------------------- */
 
     /** @inheritDoc */
diff --git a/module/documents/chatMessage.mjs b/module/documents/chatMessage.mjs
index 480f8c69..78bab016 100644
--- a/module/documents/chatMessage.mjs
+++ b/module/documents/chatMessage.mjs
@@ -9,9 +9,9 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
             actor && this.isContentVisible
                 ? actor
                 : {
-                    img: this.author.avatar ? this.author.avatar : 'icons/svg/mystery-man.svg',
-                    name: ''
-                };
+                      img: this.author.avatar ? this.author.avatar : 'icons/svg/mystery-man.svg',
+                      name: ''
+                  };
         /* We can change to fully implementing the renderHTML function if needed, instead of augmenting it. */
         const html = await super.renderHTML({ actor: actorData, author: this.author });
 
@@ -183,11 +183,7 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
             if (pendingingSaves.length) {
                 const confirm = await foundry.applications.api.DialogV2.confirm({
                     window: { title: game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.title') },
-                    content: `
-                        <p>${game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.unfinishedRolls')}</p>
-                        <p><i>${game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.warning')}</i></p>
-                        <p>${game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.confirmation')}</p>
-                    `
+                    content: `<p>${game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.unfinishedRolls')}</p><p>${game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.confirmation')}</p><p><i>${game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.warning')}</i></p>`
                 });
                 if (!confirm) return;
             }
@@ -251,24 +247,8 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
         const targets = this.filterPermTargets(this.system.hitTargets),
             config = foundry.utils.deepClone(this.system);
         config.event = event;
-
         if (targets.length === 0)
-            return ui.notifications.info(game.i18n.localize('DAGGERHEART.UI.Notifications.noTargetsSelectedOrPerm'));
-        else if (config.hasSave) {
-            const pendingingSaves = targets.filter(t => t.saved.success === null);
-            if (pendingingSaves.length) {
-                const confirm = await foundry.applications.api.DialogV2.confirm({
-                    window: { title: game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.title') },
-                    content: `
-                        <p>${game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.unfinishedRolls')}</p>
-                        <p><i>${game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.warning')}</i></p>
-                        <p>${game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.confirmation')}</p>
-                    `
-                });
-                if (!confirm) return;
-            }
-        }
-
+            ui.notifications.info(game.i18n.localize('DAGGERHEART.UI.Notifications.noTargetsSelectedOrPerm'));
         this.consumeOnSuccess();
         this.system.action?.workflow.get('effects')?.execute(config, targets, true);
     }
@@ -290,14 +270,14 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
                 behaviors:
                     effects.length > 0
                         ? [
-                            {
-                                name: game.i18n.localize('TYPES.RegionBehavior.applyActiveEffect'),
-                                type: 'applyActiveEffect',
-                                system: {
-                                    effects: effects
-                                }
-                            }
-                        ]
+                              {
+                                  name: game.i18n.localize('TYPES.RegionBehavior.applyActiveEffect'),
+                                  type: 'applyActiveEffect',
+                                  system: {
+                                      effects: effects
+                                  }
+                              }
+                          ]
                         : [],
                 displayMeasurements: true,
                 locked: false,
diff --git a/module/documents/item.mjs b/module/documents/item.mjs
index 4716068d..603ca594 100644
--- a/module/documents/item.mjs
+++ b/module/documents/item.mjs
@@ -82,7 +82,6 @@ export default class DHItem extends foundry.documents.Item {
     /** @inheritdoc */
     static async createDialog(data = {}, createOptions = {}, options = {}) {
         const { folders, types, template, context = {}, ...dialogOptions } = options;
-        dialogOptions.classes = [options.classes ?? [], 'item-create'].flat(); // handled in hook
 
         if (types?.length === 0) {
             throw new Error('The array of sub-types to restrict to must not be empty.');
@@ -98,8 +97,8 @@ export default class DHItem extends foundry.documents.Item {
                     isInventoryItem === true
                         ? 'Inventory Items' //TODO localize
                         : isInventoryItem === false
-                            ? 'Character Items' //TODO localize
-                            : 'Other'; //TODO localize
+                          ? 'Character Items' //TODO localize
+                          : 'Other'; //TODO localize
 
                 return { value: type, label, group };
             }
diff --git a/module/documents/token.mjs b/module/documents/token.mjs
index 8e91d4f0..30862724 100644
--- a/module/documents/token.mjs
+++ b/module/documents/token.mjs
@@ -324,7 +324,7 @@ export default class DHToken extends CONFIG.Token.documentClass {
         }
         let x = 0.5 * bottom;
         let y = 0.25;
-        for (let k = width - bottom; k--;) {
+        for (let k = width - bottom; k--; ) {
             points.push(x, y);
             x += 0.5;
             y -= 0.25;
@@ -333,7 +333,7 @@ export default class DHToken extends CONFIG.Token.documentClass {
             y += 0.25;
         }
         points.push(x, y);
-        for (let k = bottom; k--;) {
+        for (let k = bottom; k--; ) {
             y += 0.5;
             points.push(x, y);
             x += 0.5;
@@ -341,14 +341,14 @@ export default class DHToken extends CONFIG.Token.documentClass {
             points.push(x, y);
         }
         y += 0.5;
-        for (let k = top; k--;) {
+        for (let k = top; k--; ) {
             points.push(x, y);
             x -= 0.5;
             y += 0.25;
             points.push(x, y);
             y += 0.5;
         }
-        for (let k = width - top; k--;) {
+        for (let k = width - top; k--; ) {
             points.push(x, y);
             x -= 0.5;
             y += 0.25;
@@ -357,7 +357,7 @@ export default class DHToken extends CONFIG.Token.documentClass {
             y -= 0.25;
         }
         points.push(x, y);
-        for (let k = top; k--;) {
+        for (let k = top; k--; ) {
             y -= 0.5;
             points.push(x, y);
             x -= 0.5;
@@ -365,7 +365,7 @@ export default class DHToken extends CONFIG.Token.documentClass {
             points.push(x, y);
         }
         y -= 0.5;
-        for (let k = bottom; k--;) {
+        for (let k = bottom; k--; ) {
             points.push(x, y);
             x += 0.5;
             y -= 0.25;
diff --git a/module/documents/tooltipManager.mjs b/module/documents/tooltipManager.mjs
index 3e3f4a16..18c03169 100644
--- a/module/documents/tooltipManager.mjs
+++ b/module/documents/tooltipManager.mjs
@@ -3,6 +3,7 @@ import { AdversaryBPPerEncounter, BaseBPPerEncounter } from '../config/encounter
 export default class DhTooltipManager extends foundry.helpers.interaction.TooltipManager {
     #wide = false;
     #bordered = false;
+    #active = false;
 
     async activate(element, options = {}) {
         const { TextEditor } = foundry.applications.ux;
diff --git a/module/enrichers/DamageEnricher.mjs b/module/enrichers/DamageEnricher.mjs
index db0e8729..e3f9c42a 100644
--- a/module/enrichers/DamageEnricher.mjs
+++ b/module/enrichers/DamageEnricher.mjs
@@ -1,7 +1,7 @@
 import { parseInlineParams } from './parser.mjs';
 
 export default function DhDamageEnricher(match, _options) {
-    const { value, type, inline } = parseInlineParams(match[1], { first: 'value' });
+    const { value, type, inline } = parseInlineParams(match[1]);
     if (!value || !type) return match[0];
     return getDamageMessage(value, type, inline, match[0]);
 }
@@ -59,7 +59,7 @@ export const renderDamageButton = async event => {
             {
                 formula: value,
                 applyTo: CONFIG.DH.GENERAL.healingTypes.hitPoints.id,
-                damageTypes: type
+                type: type
             }
         ]
     };
diff --git a/module/enrichers/DualityRollEnricher.mjs b/module/enrichers/DualityRollEnricher.mjs
index a7db01a4..5b66179f 100644
--- a/module/enrichers/DualityRollEnricher.mjs
+++ b/module/enrichers/DualityRollEnricher.mjs
@@ -15,8 +15,8 @@ function getDualityMessage(roll, flavor) {
         (roll?.trait
             ? game.i18n.format('DAGGERHEART.GENERAL.rollWith', { roll: trait })
             : roll?.reaction
-                ? game.i18n.localize('DAGGERHEART.GENERAL.reactionRoll')
-                : game.i18n.localize('DAGGERHEART.GENERAL.duality'));
+              ? game.i18n.localize('DAGGERHEART.GENERAL.reactionRoll')
+              : game.i18n.localize('DAGGERHEART.GENERAL.duality'));
 
     const dataLabel = trait
         ? game.i18n.localize(abilities[roll.trait].label)
@@ -25,14 +25,14 @@ function getDualityMessage(roll, flavor) {
     const advantage = roll?.advantage
         ? CONFIG.DH.ACTIONS.advantageState.advantage.value
         : roll?.disadvantage
-            ? CONFIG.DH.ACTIONS.advantageState.disadvantage.value
-            : undefined;
+          ? CONFIG.DH.ACTIONS.advantageState.disadvantage.value
+          : undefined;
     const advantageLabel =
         advantage === CONFIG.DH.ACTIONS.advantageState.advantage.value
             ? 'Advantage'
             : advantage === CONFIG.DH.ACTIONS.advantageState.disadvantage.value
-                ? 'Disadvantage'
-                : undefined;
+              ? 'Disadvantage'
+              : undefined;
 
     const dualityElement = document.createElement('span');
     dualityElement.innerHTML = `
diff --git a/module/enrichers/TemplateEnricher.mjs b/module/enrichers/TemplateEnricher.mjs
index bbe93b17..8db3ec14 100644
--- a/module/enrichers/TemplateEnricher.mjs
+++ b/module/enrichers/TemplateEnricher.mjs
@@ -8,8 +8,8 @@ export default function DhTemplateEnricher(match, _options) {
     const range =
         params.range && Number.isNaN(Number(params.range))
             ? Object.values(CONFIG.DH.GENERAL.templateRanges).find(
-                x => x.id.toLowerCase() === params.range || x.short === params.range
-            )?.id
+                  x => x.id.toLowerCase() === params.range || x.short === params.range
+              )?.id
             : params.range;
 
     if (!CONFIG.DH.GENERAL.templateTypes[type] || !range) return match[0];
diff --git a/module/enrichers/parser.mjs b/module/enrichers/parser.mjs
index 76ea0b73..365caec9 100644
--- a/module/enrichers/parser.mjs
+++ b/module/enrichers/parser.mjs
@@ -8,7 +8,7 @@ export function parseInlineParams(paramString, { first } = {}) {
     const parts = paramString.split('|').map(x => x.trim());
     const params = {};
     for (const [idx, param] of parts.entries()) {
-        if (first && idx === 0 && !param.includes(':')) {
+        if (first && idx === 0) {
             params[first] = param;
         } else {
             const parts = param.split(':');
diff --git a/module/helpers/utils.mjs b/module/helpers/utils.mjs
index af6c2777..2f20175b 100644
--- a/module/helpers/utils.mjs
+++ b/module/helpers/utils.mjs
@@ -108,9 +108,9 @@ export const tagifyElement = (element, baseOptions, onChange, tagifyOptions = {}
     const options = Array.isArray(baseOptions)
         ? baseOptions
         : Object.keys(baseOptions).map(optionKey => ({
-            ...baseOptions[optionKey],
-            id: optionKey
-        }));
+              ...baseOptions[optionKey],
+              id: optionKey
+          }));
 
     const tagifyElement = new Tagify(element, {
         tagTextProp: 'name',
@@ -605,8 +605,8 @@ export function calculateExpectedValue(formulaOrTerms) {
     const terms = Array.isArray(formulaOrTerms)
         ? formulaOrTerms
         : typeof formulaOrTerms === 'string'
-            ? parseTermsFromSimpleFormula(formulaOrTerms)
-            : [formulaOrTerms];
+          ? parseTermsFromSimpleFormula(formulaOrTerms)
+          : [formulaOrTerms];
     return terms.reduce((r, t) => r + (t.bonus ?? 0) + (t.diceQuantity ? (t.diceQuantity * (t.faces + 1)) / 2 : 0), 0);
 }
 
@@ -656,8 +656,8 @@ export async function RefreshFeatures(
                         'resource.value': increasing
                             ? 0
                             : game.system.api.documents.DhActiveEffect.effectSafeEval(
-                                Roll.replaceFormulaData(item.system.resource.max, actor.getRollData())
-                            )
+                                  Roll.replaceFormulaData(item.system.resource.max, actor.getRollData())
+                              )
                     };
                 }
                 if (item.system.metadata?.hasActions) {
@@ -879,7 +879,6 @@ export async function fromUuids(uuids) {
     const packEmbeddedEntries = entries.filter(
         e =>
             !(e.value instanceof Document) &&
-            e.parsed &&
             e.parsed.collection instanceof foundry.documents.collections.CompendiumCollection &&
             e.parsed.embedded.length > 0
     );
@@ -896,7 +895,7 @@ export async function fromUuids(uuids) {
         const pack = game.packs.get(packGroup[0].value.pack);
         if (!pack) continue;
 
-        const ids = packGroup.map(p => p.parsed?.id).filter(id => !!id);
+        const ids = packGroup.map(p => p.parsed.id);
         const documents = await pack.getDocuments({ _id__in: ids });
         for (const p of packGroup) {
             p.value = documents.find(d => d.id === p.parsed.id) ?? p.value;
diff --git a/module/systemRegistration/migrations.mjs b/module/systemRegistration/migrations.mjs
index b718a127..b4c446b2 100644
--- a/module/systemRegistration/migrations.mjs
+++ b/module/systemRegistration/migrations.mjs
@@ -24,8 +24,8 @@ export async function runMigrations() {
                     const { originItemType, isMulticlass, identifier } = item.system;
                     const base = originItemType
                         ? actor.items.find(
-                            x => x.type === originItemType && Boolean(isMulticlass) === Boolean(x.system.isMulticlass)
-                        )
+                              x => x.type === originItemType && Boolean(isMulticlass) === Boolean(x.system.isMulticlass)
+                          )
                         : null;
                     if (base) {
                         const feature = base.system.features.find(x => x.item && x.item.uuid === item.uuid);
diff --git a/package-lock.json b/package-lock.json
index dee096eb..28223032 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,20 +13,18 @@
         "rollup": "^4.40.0"
       },
       "devDependencies": {
-        "@eslint/js": "^10.0.1",
         "@foundryvtt/foundryvtt-cli": "^1.0.2",
         "@rollup/plugin-commonjs": "^25.0.7",
         "@rollup/plugin-node-resolve": "^15.2.3",
-        "@stylistic/eslint-plugin": "^5.10.0",
         "concurrently": "^8.2.2",
         "eslint": "^10.2.1",
+        "eslint-plugin-prettier": "^5.5.5",
         "globals": "^17.5.0",
         "husky": "^9.1.7",
         "lint-staged": "^16.4.0",
         "postcss": "^8.4.32",
-        "rollup-plugin-postcss": "^4.0.2",
-        "typescript": "^6.0.3",
-        "typescript-eslint": "^8.60.1"
+        "prettier": "^3.5.3",
+        "rollup-plugin-postcss": "^4.0.2"
       }
     },
     "node_modules/@babel/runtime": {
@@ -160,27 +158,6 @@
         "node": "^20.19.0 || ^22.13.0 || >=24"
       }
     },
-    "node_modules/@eslint/js": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-10.0.1.tgz",
-      "integrity": "sha512-zeR9k5pd4gxjZ0abRoIaxdc7I3nDktoXZk2qOv9gCNWx3mVwEn32VRhyLaRsDiJjTs0xq/T8mfPtyuXu7GWBcA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^20.19.0 || ^22.13.0 || >=24"
-      },
-      "funding": {
-        "url": "https://eslint.org/donate"
-      },
-      "peerDependencies": {
-        "eslint": "^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "eslint": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@eslint/object-schema": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-3.0.5.tgz",
@@ -443,6 +420,19 @@
       "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
       "dev": true
     },
+    "node_modules/@pkgr/core": {
+      "version": "0.2.9",
+      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.9.tgz",
+      "integrity": "sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/pkgr"
+      }
+    },
     "node_modules/@rollup/plugin-commonjs": {
       "version": "25.0.8",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-25.0.8.tgz",
@@ -771,58 +761,6 @@
         "util": "^0.12.4"
       }
     },
-    "node_modules/@stylistic/eslint-plugin": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin/-/eslint-plugin-5.10.0.tgz",
-      "integrity": "sha512-nPK52ZHvot8Ju/0A4ucSX1dcPV2/1clx0kLcH5wDmrE4naKso7TUC/voUyU1O9OTKTrR6MYip6LP0ogEMQ9jPQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.9.1",
-        "@typescript-eslint/types": "^8.56.0",
-        "eslint-visitor-keys": "^4.2.1",
-        "espree": "^10.4.0",
-        "estraverse": "^5.3.0",
-        "picomatch": "^4.0.3"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "peerDependencies": {
-        "eslint": "^9.0.0 || ^10.0.0"
-      }
-    },
-    "node_modules/@stylistic/eslint-plugin/node_modules/eslint-visitor-keys": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
-      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/@stylistic/eslint-plugin/node_modules/espree": {
-      "version": "10.4.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz",
-      "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "acorn": "^8.15.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^4.2.1"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
     "node_modules/@trysound/sax": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
@@ -857,288 +795,6 @@
       "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==",
       "dev": true
     },
-    "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.60.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.60.1.tgz",
-      "integrity": "sha512-JQ4S5GB0tfjO8BuJ4fcX+HodkzJjYBV+7OJ+wLygaX7OGQ7FudyHL4NSCA6ob+w3Yn+5MkKIozOwQhXeM7opVg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@eslint-community/regexpp": "^4.12.2",
-        "@typescript-eslint/scope-manager": "8.60.1",
-        "@typescript-eslint/type-utils": "8.60.1",
-        "@typescript-eslint/utils": "8.60.1",
-        "@typescript-eslint/visitor-keys": "8.60.1",
-        "ignore": "^7.0.5",
-        "natural-compare": "^1.4.0",
-        "ts-api-utils": "^2.5.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "@typescript-eslint/parser": "^8.60.1",
-        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
-        "typescript": ">=4.8.4 <6.1.0"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
-      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/@typescript-eslint/parser": {
-      "version": "8.60.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.60.1.tgz",
-      "integrity": "sha512-A0M6ua6H252bVjPvvtSgl2QA4+ET9S5Mtkb2GDyTxIhH/C4qDItT7RQNO5PhMC6NXGYXOR9dIalcDDgBKT7oFA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/scope-manager": "8.60.1",
-        "@typescript-eslint/types": "8.60.1",
-        "@typescript-eslint/typescript-estree": "8.60.1",
-        "@typescript-eslint/visitor-keys": "8.60.1",
-        "debug": "^4.4.3"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
-        "typescript": ">=4.8.4 <6.1.0"
-      }
-    },
-    "node_modules/@typescript-eslint/project-service": {
-      "version": "8.60.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.60.1.tgz",
-      "integrity": "sha512-eXkTH2bxmXlqD1RnOPmLZ9ZM9D3VwSx04JOwBnP9RQ+yUA5a2Mu7SfW8uaV2Aon53NJzZlZYuX7tn91Izf+xaw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.60.1",
-        "@typescript-eslint/types": "^8.60.1",
-        "debug": "^4.4.3"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.1.0"
-      }
-    },
-    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.60.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.60.1.tgz",
-      "integrity": "sha512-gvI5OQoptnxQnchOirukCuQ55svJSTuD/4k5+pC267xyBtYry748R9/c3tYUzb/iE6RZfllRz2lVulLCHkTm4w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "8.60.1",
-        "@typescript-eslint/visitor-keys": "8.60.1"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.60.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.60.1.tgz",
-      "integrity": "sha512-nh8w4qAteiKuZu3pSSzG/yGKpw0OlkrKnzFmbVRenKaD4qc+7i1GrmZaLVkr8rk4uipiPGMOW4YsM6WmKZ5CvA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.1.0"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.60.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.60.1.tgz",
-      "integrity": "sha512-sdwTrpjosW7ANQYJ39ZBF1ZyEMEGVB2UsikrserVM/30a/F1dTLnu9bGxEdosugyu5caigjLrR2qiD11asjI1A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "8.60.1",
-        "@typescript-eslint/typescript-estree": "8.60.1",
-        "@typescript-eslint/utils": "8.60.1",
-        "debug": "^4.4.3",
-        "ts-api-utils": "^2.5.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
-        "typescript": ">=4.8.4 <6.1.0"
-      }
-    },
-    "node_modules/@typescript-eslint/types": {
-      "version": "8.60.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.60.1.tgz",
-      "integrity": "sha512-4h0tY8ppCkdCzcrl2YM5M3my0xsE1Tf8om3owEu5oPWmXwkKRmk0j0LGDzYBGUcAlesEbxBhazqu/K4cu3Ug7w==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.60.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.60.1.tgz",
-      "integrity": "sha512-alpRkfG8hlVE5kdJW2GkfgDgXxold3e8e4l6EnmhRmRLbekgAPCCGDVD++sABy9FcgPFroq+uFcCSM1vR57Cew==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/project-service": "8.60.1",
-        "@typescript-eslint/tsconfig-utils": "8.60.1",
-        "@typescript-eslint/types": "8.60.1",
-        "@typescript-eslint/visitor-keys": "8.60.1",
-        "debug": "^4.4.3",
-        "minimatch": "^10.2.2",
-        "semver": "^7.7.3",
-        "tinyglobby": "^0.2.15",
-        "ts-api-utils": "^2.5.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.1.0"
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/balanced-match": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
-      "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "18 || 20 || >=22"
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
-      "version": "5.0.6",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.6.tgz",
-      "integrity": "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^4.0.2"
-      },
-      "engines": {
-        "node": "18 || 20 || >=22"
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
-      "version": "10.2.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz",
-      "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "dependencies": {
-        "brace-expansion": "^5.0.5"
-      },
-      "engines": {
-        "node": "18 || 20 || >=22"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
-      "version": "7.8.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.2.tgz",
-      "integrity": "sha512-c8jsqUZm3omBOI66G90z1Dyw5z622G8oLG+omfsHBJf3CWQTlOcwOjvOG6wtiNfW6anKm/eA39LMwMtMez2TiQ==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@typescript-eslint/utils": {
-      "version": "8.60.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.60.1.tgz",
-      "integrity": "sha512-h2MPBLoNtjc3qZWfY3Tl51yPorQ2McHn8pJfcMNTcIvrrZrr90Ykffit0yjrPFWQcRcUxzH20+6OcVdW4yHtUg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.9.1",
-        "@typescript-eslint/scope-manager": "8.60.1",
-        "@typescript-eslint/types": "8.60.1",
-        "@typescript-eslint/typescript-estree": "8.60.1"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
-        "typescript": ">=4.8.4 <6.1.0"
-      }
-    },
-    "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.60.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.60.1.tgz",
-      "integrity": "sha512-EbGRQg4FhrmwLodl+t3JNAnXHWVr9Vp+Zl1QBZVPY4ByfkzIT8cX3K6QWODHtkIZqqJVEWvhHSx3v5PDHsaQag==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "8.60.1",
-        "eslint-visitor-keys": "^5.0.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
     "node_modules/@yaireo/tagify": {
       "version": "4.35.1",
       "resolved": "https://registry.npmjs.org/@yaireo/tagify/-/tagify-4.35.1.tgz",
@@ -2197,11 +1853,10 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
-      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "^2.1.3"
       },
@@ -2586,6 +2241,37 @@
         }
       }
     },
+    "node_modules/eslint-plugin-prettier": {
+      "version": "5.5.5",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.5.5.tgz",
+      "integrity": "sha512-hscXkbqUZ2sPithAuLm5MXL+Wph+U7wHngPBv9OMWwlP8iaflyxpjTYZkmdgB4/vPIhemRlBEoLrH7UC1n7aUw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "prettier-linter-helpers": "^1.0.1",
+        "synckit": "^0.11.12"
+      },
+      "engines": {
+        "node": "^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint-plugin-prettier"
+      },
+      "peerDependencies": {
+        "@types/eslint": ">=8.0.0",
+        "eslint": ">=8.0.0",
+        "eslint-config-prettier": ">= 7.0.0 <10.0.0 || >=10.1.0",
+        "prettier": ">=3.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/eslint": {
+          "optional": true
+        },
+        "eslint-config-prettier": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/eslint-scope": {
       "version": "9.1.2",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-9.1.2.tgz",
@@ -2825,6 +2511,13 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/fast-diff": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz",
+      "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
     "node_modules/fast-fifo": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
@@ -2861,24 +2554,6 @@
         "reusify": "^1.0.4"
       }
     },
-    "node_modules/fdir": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
-      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "picomatch": "^3 || ^4"
-      },
-      "peerDependenciesMeta": {
-        "picomatch": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/file-entry-cache": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
@@ -5542,6 +5217,34 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/prettier": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz",
+      "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
+      "dev": true,
+      "bin": {
+        "prettier": "bin/prettier.cjs"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
+    "node_modules/prettier-linter-helpers": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.1.tgz",
+      "integrity": "sha512-SxToR7P8Y2lWmv/kTzVLC1t/GDI2WGjMwNhLLE9qtH8Q13C+aEmuRlzDst4Up4s0Wc8sF2M+J57iB3cMLqftfg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-diff": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
     "node_modules/process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
@@ -6350,6 +6053,22 @@
         "node": ">= 10"
       }
     },
+    "node_modules/synckit": {
+      "version": "0.11.12",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.12.tgz",
+      "integrity": "sha512-Bh7QjT8/SuKUIfObSXNHNSK6WHo6J1tHCqJsuaFDP7gP0fkzSfTxI8y85JrppZ0h8l0maIgc2tfuZQ6/t3GtnQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@pkgr/core": "^0.2.9"
+      },
+      "engines": {
+        "node": "^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/synckit"
+      }
+    },
     "node_modules/teex": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/teex/-/teex-1.0.1.tgz",
@@ -6397,23 +6116,6 @@
         "node": ">=18"
       }
     },
-    "node_modules/tinyglobby": {
-      "version": "0.2.17",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.17.tgz",
-      "integrity": "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fdir": "^6.5.0",
-        "picomatch": "^4.0.4"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/SuperchupuDev"
-      }
-    },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -6445,19 +6147,6 @@
         "tree-kill": "cli.js"
       }
     },
-    "node_modules/ts-api-utils": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.5.0.tgz",
-      "integrity": "sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18.12"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4"
-      }
-    },
     "node_modules/tslib": {
       "version": "2.8.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
@@ -6482,44 +6171,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/typescript": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz",
-      "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=14.17"
-      }
-    },
-    "node_modules/typescript-eslint": {
-      "version": "8.60.1",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.60.1.tgz",
-      "integrity": "sha512-6m5hkkRAp8lKvhVpcprAIn5KkehQEh+47oHH2VGnExEh7dhNxXlg6GPAOIu6TxbVQxhebrJDvjl3020ooiWCMA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.60.1",
-        "@typescript-eslint/parser": "8.60.1",
-        "@typescript-eslint/typescript-estree": "8.60.1",
-        "@typescript-eslint/utils": "8.60.1"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
-        "typescript": ">=4.8.4 <6.1.0"
-      }
-    },
     "node_modules/unc-path-regex": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
diff --git a/package.json b/package.json
index ede90401..73a7fe99 100644
--- a/package.json
+++ b/package.json
@@ -24,20 +24,18 @@
     "prepare": "husky"
   },
   "devDependencies": {
-    "@eslint/js": "^10.0.1",
     "@foundryvtt/foundryvtt-cli": "^1.0.2",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
-    "@stylistic/eslint-plugin": "^5.10.0",
     "concurrently": "^8.2.2",
     "eslint": "^10.2.1",
+    "eslint-plugin-prettier": "^5.5.5",
     "globals": "^17.5.0",
     "husky": "^9.1.7",
     "lint-staged": "^16.4.0",
     "postcss": "^8.4.32",
-    "rollup-plugin-postcss": "^4.0.2",
-    "typescript": "^6.0.3",
-    "typescript-eslint": "^8.60.1"
+    "prettier": "^3.5.3",
+    "rollup-plugin-postcss": "^4.0.2"
   },
   "lint-staged": {
     "**/*": "eslint --fix"
diff --git a/styles/daggerheart.less b/styles/daggerheart.less
index 4da2e043..187402fb 100755
--- a/styles/daggerheart.less
+++ b/styles/daggerheart.less
@@ -1,11 +1,19 @@
 @import './less/sheets/index.less';
 @import './less/sheets-settings/index.less';
+
 @import './less/dialog/index.less';
-@import './less/hud/index.less';
-@import './less/utils/index.less';
+
+@import './less//hud/index.less';
+
+@import './less/utils/colors.less';
+@import './less/utils/fonts.less';
+
 @import './less/global/index.less';
+
 @import './less/ui/index.less';
+
 @import './less/ux/index.less';
 
 @import '../build/tagify.css';
 
+@import './less/utils/mixin.less';
diff --git a/styles/less/dialog/actions/index.less b/styles/less/dialog/actions/index.less
deleted file mode 100644
index e9cc0401..00000000
--- a/styles/less/dialog/actions/index.less
+++ /dev/null
@@ -1 +0,0 @@
-@import "./action-list.less";
\ No newline at end of file
diff --git a/styles/less/dialog/attribution/index.less b/styles/less/dialog/attribution/index.less
deleted file mode 100644
index 2f8eaf45..00000000
--- a/styles/less/dialog/attribution/index.less
+++ /dev/null
@@ -1 +0,0 @@
-@import "./sheet.less";
\ No newline at end of file
diff --git a/styles/less/dialog/beastform/index.less b/styles/less/dialog/beastform/index.less
deleted file mode 100644
index 2f8eaf45..00000000
--- a/styles/less/dialog/beastform/index.less
+++ /dev/null
@@ -1 +0,0 @@
-@import "./sheet.less";
\ No newline at end of file
diff --git a/styles/less/dialog/character-creation/index.less b/styles/less/dialog/character-creation/index.less
deleted file mode 100644
index adf8d57a..00000000
--- a/styles/less/dialog/character-creation/index.less
+++ /dev/null
@@ -1,4 +0,0 @@
-@import "./sheet.less";
-@import "./creation-action-footer.less";
-@import "./selections-container.less";
-@import "./tab-navigation.less";
\ No newline at end of file
diff --git a/styles/less/dialog/character-reset/index.less b/styles/less/dialog/character-reset/index.less
deleted file mode 100644
index 1c574e81..00000000
--- a/styles/less/dialog/character-reset/index.less
+++ /dev/null
@@ -1 +0,0 @@
-@import './sheet.less';
\ No newline at end of file
diff --git a/styles/less/dialog/compendiumBrowserPackDialog/index.less b/styles/less/dialog/compendiumBrowserPackDialog/index.less
deleted file mode 100644
index 1c574e81..00000000
--- a/styles/less/dialog/compendiumBrowserPackDialog/index.less
+++ /dev/null
@@ -1 +0,0 @@
-@import './sheet.less';
\ No newline at end of file
diff --git a/styles/less/dialog/damage-reduction/index.less b/styles/less/dialog/damage-reduction/index.less
deleted file mode 100644
index 0b8e94a8..00000000
--- a/styles/less/dialog/damage-reduction/index.less
+++ /dev/null
@@ -1,2 +0,0 @@
-@import './sheets.less';
-@import './damage-reduction-container.less';
\ No newline at end of file
diff --git a/styles/less/dialog/damage-selection/index.less b/styles/less/dialog/damage-selection/index.less
deleted file mode 100644
index 1c574e81..00000000
--- a/styles/less/dialog/damage-selection/index.less
+++ /dev/null
@@ -1 +0,0 @@
-@import './sheet.less';
\ No newline at end of file
diff --git a/styles/less/dialog/death-move/index.less b/styles/less/dialog/death-move/index.less
deleted file mode 100644
index 8a8a16c4..00000000
--- a/styles/less/dialog/death-move/index.less
+++ /dev/null
@@ -1 +0,0 @@
-@import './death-move-container.less';
\ No newline at end of file
diff --git a/styles/less/dialog/dice-roll/index.less b/styles/less/dialog/dice-roll/index.less
deleted file mode 100644
index 8e0af6e0..00000000
--- a/styles/less/dialog/dice-roll/index.less
+++ /dev/null
@@ -1 +0,0 @@
-@import './roll-selection.less';
\ No newline at end of file
diff --git a/styles/less/dialog/downtime/index.less b/styles/less/dialog/downtime/index.less
deleted file mode 100644
index 09cc2dfe..00000000
--- a/styles/less/dialog/downtime/index.less
+++ /dev/null
@@ -1 +0,0 @@
-@import './downtime-container.less';
\ No newline at end of file
diff --git a/styles/less/dialog/group-roll-dialog/_common.less b/styles/less/dialog/group-roll-dialog/_common.less
new file mode 100644
index 00000000..f74ab8a0
--- /dev/null
+++ b/styles/less/dialog/group-roll-dialog/_common.less
@@ -0,0 +1,44 @@
+h1 {
+    color: @color-text-emphatic;
+    font: 700 var(--font-size-24) var(--dh-font-subtitle);
+    text-align: center;
+}
+
+header {
+    --bar-color: light-dark(@dark-blue, @golden);
+    color: light-dark(@dark, @beige);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    &:not(:first-child) {
+        margin-top: var(--spacer-8);
+    }
+    
+    span {
+        padding: 0 10px;
+    }
+
+    &:before {
+        content: ' ';
+        flex: 1;
+        height: 1px;
+        background: linear-gradient(90deg, rgba(0, 0, 0, 0) 0%, var(--bar-color) 100%);
+    }
+
+    &:after {
+        content: ' ';
+        flex: 1;
+        height: 1px;
+        background: linear-gradient(90deg, var(--bar-color) 0%, rgba(0, 0, 0, 0) 100%);
+    }
+}
+
+img.portrait {
+    border-radius: 50%;
+    border: none;
+    object-fit: cover;
+    object-position: center top;
+    width: 2.5rem;
+    height: 2.5rem;
+}
diff --git a/styles/less/dialog/group-roll-dialog/index.less b/styles/less/dialog/group-roll-dialog/index.less
index f90b57dc..27925fa2 100644
--- a/styles/less/dialog/group-roll-dialog/index.less
+++ b/styles/less/dialog/group-roll-dialog/index.less
@@ -1,3 +1,8 @@
-@import './sheet.less';
-@import './initialization.less';
-@import './main.less';
+.daggerheart.dialog.dh-style.views.group-roll-dialog {
+    .window-content {
+        @import "./_common.less";
+    }
+}
+
+@import "./initialization.less";
+@import "./main.less";
diff --git a/styles/less/dialog/group-roll-dialog/sheet.less b/styles/less/dialog/group-roll-dialog/sheet.less
deleted file mode 100644
index 938710c9..00000000
--- a/styles/less/dialog/group-roll-dialog/sheet.less
+++ /dev/null
@@ -1,48 +0,0 @@
-.daggerheart.dialog.dh-style.views.group-roll-dialog {
-    .window-content {
-        h1 {
-            color: @color-text-emphatic;
-            font: 700 var(--font-size-24) var(--dh-font-subtitle);
-            text-align: center;
-        }
-
-        header {
-            --bar-color: light-dark(@dark-blue, @golden);
-            color: light-dark(@dark, @beige);
-            display: flex;
-            justify-content: center;
-            align-items: center;
-
-            &:not(:first-child) {
-                margin-top: var(--spacer-8);
-            }
-            
-            span {
-                padding: 0 10px;
-            }
-
-            &:before {
-                content: ' ';
-                flex: 1;
-                height: 1px;
-                background: linear-gradient(90deg, rgba(0, 0, 0, 0) 0%, var(--bar-color) 100%);
-            }
-
-            &:after {
-                content: ' ';
-                flex: 1;
-                height: 1px;
-                background: linear-gradient(90deg, var(--bar-color) 0%, rgba(0, 0, 0, 0) 100%);
-            }
-        }
-
-        img.portrait {
-            border-radius: 50%;
-            border: none;
-            object-fit: cover;
-            object-position: center top;
-            width: 2.5rem;
-            height: 2.5rem;
-        }
-    }
-}
\ No newline at end of file
diff --git a/styles/less/dialog/image-select/index.less b/styles/less/dialog/image-select/index.less
deleted file mode 100644
index 1c574e81..00000000
--- a/styles/less/dialog/image-select/index.less
+++ /dev/null
@@ -1 +0,0 @@
-@import './sheet.less';
\ No newline at end of file
diff --git a/styles/less/dialog/index.less b/styles/less/dialog/index.less
index 4ce4834e..e8f61318 100644
--- a/styles/less/dialog/index.less
+++ b/styles/less/dialog/index.less
@@ -1,20 +1,42 @@
-@import './actions/index.less';
-@import './attribution/index.less';
-@import './beastform/index.less';
-@import './character-creation/index.less';
-@import './character-reset/index.less';
-@import './compendiumBrowserPackDialog/index.less';
-@import './damage-reduction/index.less';
-@import './damage-selection/index.less';
-@import './death-move/index.less';
-@import './dice-roll/index.less';
-@import './downtime/index.less';
-@import './group-roll-dialog/index.less';
+@import './attribution/sheet.less';
 @import './level-up/index.less';
-@import './resource-dice/index.less';
-@import './multiclass-choice/index.less';
-@import './tag-team-dialog/index.less';
-@import './image-select/index.less';
-@import './item-transfer/index.less';
-@import './settings/index.less';
-@import './risk-it-all/index.less';
\ No newline at end of file
+
+@import './resource-dice/sheet.less';
+
+@import './actions/action-list.less';
+
+@import './damage-selection/sheet.less';
+
+@import './downtime/downtime-container.less';
+
+@import './death-move/death-move-container.less';
+
+@import './beastform/sheet.less';
+
+@import './character-creation/creation-action-footer.less';
+@import './character-creation/selections-container.less';
+@import './character-creation/sheet.less';
+@import './character-creation/tab-navigation.less';
+
+@import './dice-roll/roll-selection.less';
+@import './damage-reduction/damage-reduction-container.less';
+@import './damage-reduction/sheets.less';
+
+@import './multiclass-choice/sheet.less';
+
+@import './tag-team-dialog/initialization.less';
+@import './tag-team-dialog/sheet.less';
+
+@import './group-roll-dialog/index.less';
+
+@import './image-select/sheet.less';
+
+@import './item-transfer/sheet.less';
+
+@import './settings/change-currency-icon.less';
+
+@import './risk-it-all/sheet.less';
+
+@import './character-reset/sheet.less';
+
+@import './compendiumBrowserPackDialog/sheet.less';
diff --git a/styles/less/dialog/item-transfer/index.less b/styles/less/dialog/item-transfer/index.less
deleted file mode 100644
index 1c574e81..00000000
--- a/styles/less/dialog/item-transfer/index.less
+++ /dev/null
@@ -1 +0,0 @@
-@import './sheet.less';
\ No newline at end of file
diff --git a/styles/less/dialog/multiclass-choice/index.less b/styles/less/dialog/multiclass-choice/index.less
deleted file mode 100644
index 1c574e81..00000000
--- a/styles/less/dialog/multiclass-choice/index.less
+++ /dev/null
@@ -1 +0,0 @@
-@import './sheet.less';
\ No newline at end of file
diff --git a/styles/less/dialog/resource-dice/index.less b/styles/less/dialog/resource-dice/index.less
deleted file mode 100644
index 1c574e81..00000000
--- a/styles/less/dialog/resource-dice/index.less
+++ /dev/null
@@ -1 +0,0 @@
-@import './sheet.less';
\ No newline at end of file
diff --git a/styles/less/dialog/risk-it-all/index.less b/styles/less/dialog/risk-it-all/index.less
deleted file mode 100644
index 1c574e81..00000000
--- a/styles/less/dialog/risk-it-all/index.less
+++ /dev/null
@@ -1 +0,0 @@
-@import './sheet.less';
\ No newline at end of file
diff --git a/styles/less/dialog/settings/index.less b/styles/less/dialog/settings/index.less
deleted file mode 100644
index 235f3b9c..00000000
--- a/styles/less/dialog/settings/index.less
+++ /dev/null
@@ -1 +0,0 @@
-@import './change-currency-icon.less';
\ No newline at end of file
diff --git a/styles/less/dialog/tag-team-dialog/index.less b/styles/less/dialog/tag-team-dialog/index.less
deleted file mode 100644
index 8bf56824..00000000
--- a/styles/less/dialog/tag-team-dialog/index.less
+++ /dev/null
@@ -1,2 +0,0 @@
-@import './sheet.less';
-@import './initialization.less';
\ No newline at end of file
diff --git a/styles/less/hud/index.less b/styles/less/hud/index.less
index f1f4602e..459f8fd7 100644
--- a/styles/less/hud/index.less
+++ b/styles/less/hud/index.less
@@ -1 +1 @@
-@import './token-hud/index.less';
+@import './token-hud/token-hud.less';
diff --git a/styles/less/hud/token-hud/index.less b/styles/less/hud/token-hud/index.less
deleted file mode 100644
index c86d0939..00000000
--- a/styles/less/hud/token-hud/index.less
+++ /dev/null
@@ -1 +0,0 @@
-@import './token-hud.less';
\ No newline at end of file
diff --git a/styles/less/hud/token-hud/token-hud.less b/styles/less/hud/token-hud/token-hud.less
index 3b998f4e..3cb94e1e 100644
--- a/styles/less/hud/token-hud/token-hud.less
+++ b/styles/less/hud/token-hud/token-hud.less
@@ -38,9 +38,6 @@
     }
 
     .status-effects {
-        // TODO: Remove when the issue https://github.com/foundryvtt/foundryvtt/issues/14410 is resolved and Foundry handles it cleanly themselves.
-        grid-template-rows: min-content;
-
         .effect-control-container {
             position: relative;
 
diff --git a/styles/less/sheets-settings/adversary-settings/index.less b/styles/less/sheets-settings/adversary-settings/index.less
deleted file mode 100644
index 5968577d..00000000
--- a/styles/less/sheets-settings/adversary-settings/index.less
+++ /dev/null
@@ -1,3 +0,0 @@
-@import './sheet.less';
-@import './experiences.less';
-@import './features.less';
\ No newline at end of file
diff --git a/styles/less/sheets-settings/character-settings/index.less b/styles/less/sheets-settings/character-settings/index.less
deleted file mode 100644
index 1c574e81..00000000
--- a/styles/less/sheets-settings/character-settings/index.less
+++ /dev/null
@@ -1 +0,0 @@
-@import './sheet.less';
\ No newline at end of file
diff --git a/styles/less/sheets-settings/environment-settings/index.less b/styles/less/sheets-settings/environment-settings/index.less
deleted file mode 100644
index 1e6ee34d..00000000
--- a/styles/less/sheets-settings/environment-settings/index.less
+++ /dev/null
@@ -1,2 +0,0 @@
-@import './adversaries.less';
-@import './features.less';
\ No newline at end of file
diff --git a/styles/less/sheets-settings/index.less b/styles/less/sheets-settings/index.less
index 53a03868..f575f848 100644
--- a/styles/less/sheets-settings/index.less
+++ b/styles/less/sheets-settings/index.less
@@ -1,4 +1,8 @@
 @import './header.less';
-@import './adversary-settings/index.less';
-@import './character-settings/index.less';
-@import './environment-settings/index.less';
+@import './adversary-settings/sheet.less';
+@import './adversary-settings/experiences.less';
+@import './adversary-settings/features.less';
+@import './character-settings/sheet.less';
+
+@import './environment-settings/features.less';
+@import './environment-settings/adversaries.less';
diff --git a/styles/less/sheets/actions/index.less b/styles/less/sheets/actions/index.less
deleted file mode 100644
index 29ef8645..00000000
--- a/styles/less/sheets/actions/index.less
+++ /dev/null
@@ -1 +0,0 @@
-@import './actions.less';
\ No newline at end of file
diff --git a/styles/less/sheets/activeEffects/index.less b/styles/less/sheets/activeEffects/index.less
deleted file mode 100644
index 19f8a3a7..00000000
--- a/styles/less/sheets/activeEffects/index.less
+++ /dev/null
@@ -1 +0,0 @@
-@import './activeEffects.less';
\ No newline at end of file
diff --git a/styles/less/sheets/actors/index.less b/styles/less/sheets/actors/index.less
deleted file mode 100644
index 959bc0f5..00000000
--- a/styles/less/sheets/actors/index.less
+++ /dev/null
@@ -1,7 +0,0 @@
-@import './actor-sheet-shared.less';
-@import './adversary/index.less';
-@import './character/index.less';
-@import './companion/index.less';
-@import './environment/index.less';
-@import './npc/index.less';
-@import './party/index.less';
\ No newline at end of file
diff --git a/styles/less/sheets/actors/npc/header.less b/styles/less/sheets/actors/npc/header.less
index 086a254c..d49d763c 100644
--- a/styles/less/sheets/actors/npc/header.less
+++ b/styles/less/sheets/actors/npc/header.less
@@ -5,7 +5,7 @@
 
         .portrait {
             cursor: pointer;
-            max-width: 275px;
+            width: 275px;
 
             img {
                 height: 275px;
diff --git a/styles/less/sheets/index.less b/styles/less/sheets/index.less
index 451ae03a..4312f755 100644
--- a/styles/less/sheets/index.less
+++ b/styles/less/sheets/index.less
@@ -1,5 +1,22 @@
-@import './activeEffects/index.less';
-@import './actions/index.less';
-@import './actors/index.less';
-@import './items/index.less';
-@import './rollTables/index.less';
\ No newline at end of file
+@import './actions/actions.less';
+
+@import './actors/actor-sheet-shared.less';
+
+@import './actors/adversary/index.less';
+@import './actors/character/index.less';
+@import './actors/companion/index.less';
+@import './actors/environment/index.less';
+@import './actors/npc/index.less';
+@import './actors/party/index.less';
+
+@import './items/beastform.less';
+@import './items/class.less';
+@import './items/domain-card.less';
+@import './items/feature.less';
+@import './items/heritage.less';
+@import './items/item-sheet-shared.less';
+
+@import './rollTables/sheet.less';
+@import './actions/actions.less';
+
+@import './activeEffects/activeEffects.less';
diff --git a/styles/less/sheets/items/index.less b/styles/less/sheets/items/index.less
deleted file mode 100644
index 7c40a2e3..00000000
--- a/styles/less/sheets/items/index.less
+++ /dev/null
@@ -1,6 +0,0 @@
-@import './beastform.less';
-@import './class.less';
-@import './domain-card.less';
-@import './feature.less';
-@import './heritage.less';
-@import './item-sheet-shared.less';
\ No newline at end of file
diff --git a/styles/less/sheets/rollTables/index.less b/styles/less/sheets/rollTables/index.less
deleted file mode 100644
index 1c574e81..00000000
--- a/styles/less/sheets/rollTables/index.less
+++ /dev/null
@@ -1 +0,0 @@
-@import './sheet.less';
\ No newline at end of file
diff --git a/styles/less/ui/chat/index.less b/styles/less/ui/chat/index.less
deleted file mode 100644
index 9cadbd04..00000000
--- a/styles/less/ui/chat/index.less
+++ /dev/null
@@ -1,10 +0,0 @@
-@import './sheet.less';
-@import './ability-use.less';
-@import './action.less';
-@import './chat.less';
-@import './damage-summary.less';
-@import './deathmoves.less';
-@import './downtime.less';
-@import './effect-summary.less';
-@import './group-roll.less';
-@import './refresh-message.less';
\ No newline at end of file
diff --git a/styles/less/ui/combat-sidebar/index.less b/styles/less/ui/combat-sidebar/index.less
deleted file mode 100644
index 786815ef..00000000
--- a/styles/less/ui/combat-sidebar/index.less
+++ /dev/null
@@ -1,5 +0,0 @@
-@import './combat-sidebar.less';
-@import './combatant-controls.less';
-@import './encounter-controls.less';
-@import './spotlight-control.less';
-@import './token-actions.less';
\ No newline at end of file
diff --git a/styles/less/ui/countdown/countdown.less b/styles/less/ui/countdown/countdown.less
index 63e539ba..66a6c88a 100644
--- a/styles/less/ui/countdown/countdown.less
+++ b/styles/less/ui/countdown/countdown.less
@@ -18,7 +18,7 @@
     border: 0;
     box-shadow: none;
     color: @color-text-primary;
-    width: 18.75rem;
+    width: 300px;
     pointer-events: all;
     align-self: flex-end;
     transition: 0.3s right ease-in-out;
@@ -36,7 +36,7 @@
         transition: opacity var(--ui-fade-duration);
     }
 
-    &:not(.performance-low, .noblur) {
+    :not(.performance-low, .noblur) {
         backdrop-filter: blur(5px);
     }
 
@@ -49,7 +49,8 @@
     }
 
     &.icon-only {
-        width: 12rem;
+        width: 180px;
+        min-width: 180px;
     }
 
     .countdowns-header,
@@ -107,8 +108,8 @@
                 gap: 16px;
 
                 img {
-                    width: 2.75rem;
-                    height: 2.75rem;
+                    width: 44px;
+                    height: 44px;
                     border-radius: 6px;
                 }
 
@@ -126,7 +127,7 @@
                         .countdown-tool-controls {
                             display: flex;
                             align-items: center;
-                            gap: var(--spacer-12);
+                            gap: 16px;
                         }
 
                         .progress-tag {
diff --git a/styles/less/ui/countdown/index.less b/styles/less/ui/countdown/index.less
deleted file mode 100644
index 45ecda26..00000000
--- a/styles/less/ui/countdown/index.less
+++ /dev/null
@@ -1,3 +0,0 @@
-@import './sheet.less';
-@import './countdown-edit.less';
-@import './countdown.less';
\ No newline at end of file
diff --git a/styles/less/ui/effects-display/index.less b/styles/less/ui/effects-display/index.less
deleted file mode 100644
index 1c574e81..00000000
--- a/styles/less/ui/effects-display/index.less
+++ /dev/null
@@ -1 +0,0 @@
-@import './sheet.less';
\ No newline at end of file
diff --git a/styles/less/ui/index.less b/styles/less/ui/index.less
index 53a71b9b..31ea8955 100644
--- a/styles/less/ui/index.less
+++ b/styles/less/ui/index.less
@@ -1,11 +1,40 @@
-@import './chat/index.less';
-@import './combat-sidebar/index.less';
-@import './countdown/index.less';
-@import './effects-display/index.less';
-@import './item-browser/index.less';
-@import './ownership-selection/index.less';
-@import './resources/index.less';
-@import './scene-config/index.less';
-@import './scene-navigation/index.less';
-@import './settings/index.less';
-@import './sidebar/index.less';
\ No newline at end of file
+@import './chat/ability-use.less';
+@import './chat/action.less';
+@import './chat/chat.less';
+@import './chat/damage-summary.less';
+@import './chat/downtime.less';
+@import './chat/effect-summary.less';
+@import './chat/group-roll.less';
+@import './chat/refresh-message.less';
+@import './chat/deathmoves.less';
+@import './chat/sheet.less';
+
+@import './combat-sidebar/combat-sidebar.less';
+@import './combat-sidebar/combatant-controls.less';
+@import './combat-sidebar/encounter-controls.less';
+@import './combat-sidebar/spotlight-control.less';
+@import './combat-sidebar/token-actions.less';
+@import './item-browser/item-browser.less';
+
+@import './countdown/countdown.less';
+@import './countdown/countdown-edit.less';
+@import './countdown/sheet.less';
+
+@import './ownership-selection/ownership-selection.less';
+
+@import './resources/resources.less';
+
+@import './settings/settings.less';
+@import './settings/homebrew-settings/domains.less';
+@import './settings/homebrew-settings/types.less';
+@import './settings/homebrew-settings/resources.less';
+@import './settings/appearance-settings/diceSoNice.less';
+
+@import './sidebar/tabs.less';
+@import './sidebar/daggerheartMenu.less';
+
+@import './scene-config/scene-config.less';
+
+@import './effects-display/sheet.less';
+
+@import './scene-navigation/scene-navigation.less';
diff --git a/styles/less/ui/item-browser/index.less b/styles/less/ui/item-browser/index.less
deleted file mode 100644
index 842f716b..00000000
--- a/styles/less/ui/item-browser/index.less
+++ /dev/null
@@ -1 +0,0 @@
-@import './item-browser.less';
\ No newline at end of file
diff --git a/styles/less/ui/ownership-selection/index.less b/styles/less/ui/ownership-selection/index.less
deleted file mode 100644
index 9646670a..00000000
--- a/styles/less/ui/ownership-selection/index.less
+++ /dev/null
@@ -1 +0,0 @@
-@import './ownership-selection.less';
\ No newline at end of file
diff --git a/styles/less/ui/resources/index.less b/styles/less/ui/resources/index.less
deleted file mode 100644
index a7d08785..00000000
--- a/styles/less/ui/resources/index.less
+++ /dev/null
@@ -1 +0,0 @@
-@import './resources.less';
\ No newline at end of file
diff --git a/styles/less/ui/scene-config/index.less b/styles/less/ui/scene-config/index.less
deleted file mode 100644
index 4e3af363..00000000
--- a/styles/less/ui/scene-config/index.less
+++ /dev/null
@@ -1 +0,0 @@
-@import './scene-config.less';
\ No newline at end of file
diff --git a/styles/less/ui/scene-navigation/index.less b/styles/less/ui/scene-navigation/index.less
deleted file mode 100644
index c0765ae7..00000000
--- a/styles/less/ui/scene-navigation/index.less
+++ /dev/null
@@ -1 +0,0 @@
-@import './scene-navigation.less';
\ No newline at end of file
diff --git a/styles/less/ui/settings/appearance-settings/index.less b/styles/less/ui/settings/appearance-settings/index.less
deleted file mode 100644
index 8b1c109a..00000000
--- a/styles/less/ui/settings/appearance-settings/index.less
+++ /dev/null
@@ -1 +0,0 @@
-@import './diceSoNice.less';
\ No newline at end of file
diff --git a/styles/less/ui/settings/homebrew-settings/index.less b/styles/less/ui/settings/homebrew-settings/index.less
deleted file mode 100644
index f0a8bfc1..00000000
--- a/styles/less/ui/settings/homebrew-settings/index.less
+++ /dev/null
@@ -1,3 +0,0 @@
-@import './domains.less';
-@import './resources.less';
-@import './types.less';
\ No newline at end of file
diff --git a/styles/less/ui/settings/index.less b/styles/less/ui/settings/index.less
deleted file mode 100644
index 4e1aa798..00000000
--- a/styles/less/ui/settings/index.less
+++ /dev/null
@@ -1,3 +0,0 @@
-@import './settings.less';
-@import './appearance-settings/index.less';
-@import './homebrew-settings/index.less';
\ No newline at end of file
diff --git a/styles/less/ui/sidebar/index.less b/styles/less/ui/sidebar/index.less
deleted file mode 100644
index b4961b41..00000000
--- a/styles/less/ui/sidebar/index.less
+++ /dev/null
@@ -1,2 +0,0 @@
-@import './daggerheartMenu.less';
-@import './tabs.less';
\ No newline at end of file
diff --git a/styles/less/utils/index.less b/styles/less/utils/index.less
deleted file mode 100644
index 37b096d3..00000000
--- a/styles/less/utils/index.less
+++ /dev/null
@@ -1,4 +0,0 @@
-@import './colors.less';
-@import './fonts.less';
-@import './mixin.less';
-@import './spacing.less';
\ No newline at end of file
diff --git a/styles/less/ux/autocomplete/index.less b/styles/less/ux/autocomplete/index.less
deleted file mode 100644
index 91007146..00000000
--- a/styles/less/ux/autocomplete/index.less
+++ /dev/null
@@ -1 +0,0 @@
-@import './autocomplete.less';
\ No newline at end of file
diff --git a/styles/less/ux/index.less b/styles/less/ux/index.less
index b6c9a2e7..a73f2d1c 100644
--- a/styles/less/ux/index.less
+++ b/styles/less/ux/index.less
@@ -1,2 +1,10 @@
-@import './autocomplete/index.less';
-@import './tooltip/index.less';
\ No newline at end of file
+@import './tooltip/sheet.less';
+@import './tooltip/tooltip.less';
+@import './tooltip/armorManagement.less';
+@import './tooltip/battlepoints.less';
+@import './tooltip/bordered-tooltip.less';
+@import './tooltip/domain-cards.less';
+
+@import './autocomplete/autocomplete.less';
+
+@import './tooltip/resource-management.less';
diff --git a/styles/less/ux/tooltip/index.less b/styles/less/ux/tooltip/index.less
deleted file mode 100644
index eeec9354..00000000
--- a/styles/less/ux/tooltip/index.less
+++ /dev/null
@@ -1,7 +0,0 @@
-@import './sheet.less';
-@import './armorManagement.less';
-@import './battlepoints.less';
-@import './bordered-tooltip.less';
-@import './domain-cards.less';
-@import './resource-management.less';
-@import './tooltip.less';
\ No newline at end of file
diff --git a/system.json b/system.json
index ed14a17b..5994c576 100644
--- a/system.json
+++ b/system.json
@@ -2,7 +2,7 @@
     "id": "daggerheart",
     "title": "Daggerheart",
     "description": "An unofficial implementation of the Daggerheart system",
-    "version": "2.3.2",
+    "version": "2.3.0",
     "compatibility": {
         "minimum": "14.361",
         "verified": "14.363",
@@ -10,7 +10,7 @@
     },
     "url": "https://github.com/Foundryborne/daggerheart",
     "manifest": "https://raw.githubusercontent.com/Foundryborne/daggerheart/v14/system.json",
-    "download": "https://github.com/Foundryborne/daggerheart/releases/download/2.3.2/system.zip",
+    "download": "https://github.com/Foundryborne/daggerheart/releases/download/2.3.0/system.zip",
     "authors": [
         {
             "name": "WBHarry"
diff --git a/templates/sheets/actors/npc/header.hbs b/templates/sheets/actors/npc/header.hbs
index fce300da..8dc345dc 100644
--- a/templates/sheets/actors/npc/header.hbs
+++ b/templates/sheets/actors/npc/header.hbs
@@ -31,12 +31,10 @@
             <span class="description">
                 <i>{{{description}}}</i>
             </span>
-            {{#if source.system.motives}}
-                <div class="motives-and-tactics">
-                    <b>{{localize 'DAGGERHEART.ACTORS.NPC.FIELDS.motives.label'}}: </b>
-                    {{source.system.motives}}
-                </div>
-            {{/if}}
+            <div class="motives-and-tactics">
+                <b>{{localize 'DAGGERHEART.ACTORS.NPC.FIELDS.motives.label'}}: </b>
+                {{source.system.motives}}
+            </div>
         </div>
     </div>
 </header>
\ No newline at end of file
diff --git a/templates/sheets/actors/party/party-members.hbs b/templates/sheets/actors/party/party-members.hbs
index 55cacb79..c7870bc6 100644
--- a/templates/sheets/actors/party/party-members.hbs
+++ b/templates/sheets/actors/party/party-members.hbs
@@ -42,7 +42,7 @@
                         {{#if member.difficulty includeZero=true}}
                             <div class="evasion" data-tooltip="DAGGERHEART.GENERAL.difficulty">{{member.difficulty}}</div>
                         {{/if}}
-                        {{#unless (or (eq member.type 'companion') (eq member.type 'npc'))}}
+                        {{#unless (eq member.type 'companion')}}
                             <div class="threshold-section">
                                 <h4 class="threshold-label">{{localize "DAGGERHEART.ACTORS.Party.Thresholds.minor"}}</h4>
                                 <h4 class="threshold-value">{{member.damageThresholds.major}}</h4>
@@ -58,7 +58,7 @@
                             <a class="delete-icon" data-action="deletePartyMember" data-uuid="{{member.uuid}}"><i class="fa-regular fa-times" inert></i></a>
                         </h2>
                         <div>
-                            {{#unless (or (eq member.type 'companion') (eq member.type 'adversary') (eq member.type 'npc')) }}
+                            {{#unless (or (eq member.type 'companion') (eq member.type 'adversary')) }}
                                 <div class="hope-section">
                                     <h4>{{localize "DAGGERHEART.GENERAL.hope"}}</h4>
                                     {{#times member.resources.hope.max}}
@@ -79,7 +79,7 @@
                     </header>
                     <section class="body">
                         <section class="resources">
-                            {{#unless (or (eq member.type 'companion') (eq member.type 'npc')) }}
+                            {{#unless (eq member.type 'companion') }}
                                 <div class="slot-section">
                                     <div class="slot-label" data-tooltip="DAGGERHEART.GENERAL.HitPoints.plural">
                                         <span class="label">
@@ -101,27 +101,25 @@
                                 </div>
                             {{/unless}}
 
-                            {{#unless (eq member.type 'npc')}}
-                                <div class="slot-section">
-                                    <div class="slot-label" data-tooltip="DAGGERHEART.GENERAL.stress">
-                                        <span class="label">
-                                            <i class="fa-solid fa-bolt" inert></i>
-                                        </span>
-                                        <span class="value">
-                                            <span class="current">{{member.resources.stress.value}}</span>
-                                            / 
-                                            <span class="max">{{member.resources.stress.max}}</span>
-                                        </span>
-                                    </div>
-                                    <div class="slot-bar">
-                                        {{#times member.resources.stress.max}}
-                                            <span class='slot {{#if (gte member.resources.stress.value (add this 1))}}filled{{/if}}'
-                                            data-action='toggleStress' data-actor-id="{{member.uuid}}" data-value="{{add this 1}}">
-                                            </span>
-                                        {{/times}}
-                                    </div>
+                            <div class="slot-section">
+                                <div class="slot-label" data-tooltip="DAGGERHEART.GENERAL.stress">
+                                    <span class="label">
+                                        <i class="fa-solid fa-bolt" inert></i>
+                                    </span>
+                                    <span class="value">
+                                        <span class="current">{{member.resources.stress.value}}</span>
+                                        / 
+                                        <span class="max">{{member.resources.stress.max}}</span>
+                                    </span>
                                 </div>
-                            {{/unless}}
+                                <div class="slot-bar">
+                                    {{#times member.resources.stress.max}}
+                                        <span class='slot {{#if (gte member.resources.stress.value (add this 1))}}filled{{/if}}'
+                                        data-action='toggleStress' data-actor-id="{{member.uuid}}" data-value="{{add this 1}}">
+                                        </span>
+                                    {{/times}}
+                                </div>
+                            </div>
 
                             {{#if member.armorScore.max}}
                                 <div class="slot-section">
diff --git a/templates/ui/combatTracker/combatTrackerHeader.hbs b/templates/ui/combatTracker/combatTrackerHeader.hbs
index 9f5a7561..803286ab 100644
--- a/templates/ui/combatTracker/combatTrackerHeader.hbs
+++ b/templates/ui/combatTracker/combatTrackerHeader.hbs
@@ -50,11 +50,6 @@
     </nav>
     {{/if}}
 
-    {{!-- Encounter Name --}}
-    {{#if combat.name}}
-    <h2 class="encounter-name">{{ combat.name }}</h2>
-    {{/if}}
-
     <div class="encounter-controls {{#if hasCombat}}combat{{/if}}">
         {{!-- Combat Status --}}
         <strong class="encounter-title">
diff --git a/templates/ui/countdowns.hbs b/templates/ui/countdowns.hbs
index faaffdc5..95067826 100644
--- a/templates/ui/countdowns.hbs
+++ b/templates/ui/countdowns.hbs
@@ -11,20 +11,18 @@
     </header>
     <div class="countdowns-container">
         {{#each countdowns as | countdown id |}}
-            <div class="countdown-container {{#if ../iconOnly}}icon-only{{/if}}" data-countdown="{{id}}">
+            <div class="countdown-container {{#if ../iconOnly}}icon-only{{/if}}">
                 <div class="countdown-main-container">
                     <img src="{{countdown.img}}" {{#if ../iconOnly}}data-tooltip="{{countdown.name}}"{{/if}}/>
                     <div class="countdown-content">
-                        {{#unless ../iconOnly}}
-                            <header>{{countdown.name}}</header>
-                        {{/unless}}
+                        {{#unless ../iconOnly}}<label>{{countdown.name}}</label>{{/unless}}
                         <div class="countdown-tools">
                             <div class="countdown-tool-controls">
-                                {{#if countdown.editable}}<a data-action="decreaseCountdown"><i class="fa-solid fa-minus"></i></a>{{/if}}
+                                {{#if countdown.editable}}<a data-action="decreaseCountdown" id="{{id}}"><i class="fa-solid fa-minus"></i></a>{{/if}}
                                 <div class="progress-tag">
                                     {{countdown.progress.current}}/{{countdown.progress.start}}
                                 </div>
-                                {{#if countdown.editable}}<a data-action="increaseCountdown"><i class="fa-solid fa-plus"></i></a>{{/if}}
+                                {{#if countdown.editable}}<a data-action="increaseCountdown" id="{{id}}"><i class="fa-solid fa-plus"></i></a>{{/if}}
                             </div>
                             <div class="countdown-tool-icons">
                                 {{#if (not ../iconOnly)}}
@@ -33,7 +31,7 @@
                                     {{/if}}
                                     {{#unless (eq countdown.progress.looping "noLooping")}}
                                         <span data-tooltip="{{countdown.loopTooltip}}">
-                                            <a class="looping-container {{#if countdown.shouldLoop}}should-loop{{/if}}" {{#if countdown.loopDisabled}}disabled{{/if}} data-action="loopCountdown">
+                                            <a class="looping-container {{#if countdown.shouldLoop}}should-loop{{/if}}" {{#if countdown.loopDisabled}}disabled{{/if}} data-action="loopCountdown" id="{{id}}">
                                                 <i class="loop-marker fa-solid fa-repeat"></i>
                                                 {{#if (eq countdown.progress.looping "increasing")}}
                                                     <i class="direction-marker fa-solid fa-angles-up" data-tooltip="{{localize "DAGGERHEART.UI.Countdowns.increasingLoop"}}"></i>
diff --git a/tools/analyze-damage.mjs b/tools/analyze-damage.mjs
index 31c254ce..7b3fb9e5 100644
--- a/tools/analyze-damage.mjs
+++ b/tools/analyze-damage.mjs
@@ -82,7 +82,7 @@ function getMean(numbers) {
 }
 
 function getMedianAverageDeviation(numbers, { median }) {
-    const residuals = numbers.map(d => Math.abs(d - median));
+    const residuals = allDamage.map(d => Math.abs(d - median));
     return getMedian(residuals);
 }
 
@@ -98,8 +98,8 @@ function parseDamage(damage) {
             p.value.custom.enabled
                 ? p.value.custom.formula
                 : [p.value.flatMultiplier ? `${p.value.flatMultiplier}${p.value.dice}` : 0, p.value.bonus ?? 0]
-                    .filter(p => !!p)
-                    .join('+')
+                      .filter(p => !!p)
+                      .join('+')
         )
         .join('+');
     return getExpectedDamage(formula);
diff --git a/tools/create-symlink.mjs b/tools/create-symlink.mjs
index 4e14d5df..fd828c73 100644
--- a/tools/create-symlink.mjs
+++ b/tools/create-symlink.mjs
@@ -2,8 +2,6 @@ import fs from 'fs';
 import path from 'path';
 import readline from 'readline';
 
-console.log('Creates a foundry symlink in the base folder for type purposes\n');
-
 const askQuestion = question => {
     const rl = readline.createInterface({
         input: process.stdin,
diff --git a/tools/eslint.config.mjs b/tools/eslint.config.mjs
deleted file mode 100644
index 36a5174a..00000000
--- a/tools/eslint.config.mjs
+++ /dev/null
@@ -1,20 +0,0 @@
-import globals from 'globals';
-import { defineConfig, globalIgnores } from 'eslint/config';
-import { stylisticRules } from '../eslint.config.mjs';
-import stylistic from '@stylistic/eslint-plugin';
-
-export default defineConfig([
-    globalIgnores(['foundry/**/*']),
-    {
-        files: ['**/*.{js,mjs,cjs}'],
-        plugins: {
-            '@stylistic': stylistic
-        },
-        languageOptions: { globals: globals.node },
-        rules: {
-            'no-undef': 'error',
-            'no-unused-vars': 0,
-            ...stylisticRules
-        }
-    }
-]);