diff --git a/module/applications/settings/homebrewSettings.mjs b/module/applications/settings/homebrewSettings.mjs
index 083c468f..51bf439e 100644
--- a/module/applications/settings/homebrewSettings.mjs
+++ b/module/applications/settings/homebrewSettings.mjs
@@ -187,7 +187,6 @@ export default class DhHomebrewSettings extends HandlebarsApplicationMixin(Appli
             });
         }
 
-        game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew, this.settings.toObject());
         this.render();
     }
 
@@ -228,7 +227,6 @@ export default class DhHomebrewSettings extends HandlebarsApplicationMixin(Appli
             }
         });
 
-        game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew, this.settings.toObject());
         this.render();
     }
 
@@ -248,8 +246,6 @@ export default class DhHomebrewSettings extends HandlebarsApplicationMixin(Appli
         await this.settings.updateSource({
             [`${path}.-=${id}`]: null
         });
-
-        game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew, this.settings.toObject());
         this.render();
     }
 
diff --git a/module/applications/sheets-configs/activeEffectConfig.mjs b/module/applications/sheets-configs/activeEffectConfig.mjs
index 1f2ba5e0..28db0efe 100644
--- a/module/applications/sheets-configs/activeEffectConfig.mjs
+++ b/module/applications/sheets-configs/activeEffectConfig.mjs
@@ -4,42 +4,6 @@ export default class DhActiveEffectConfig extends foundry.applications.sheets.Ac
     constructor(options) {
         super(options);
 
-        this.changeChoices = DhActiveEffectConfig.getChangeChoices();
-    }
-
-    static DEFAULT_OPTIONS = {
-        classes: ['daggerheart', 'sheet', 'dh-style']
-    };
-
-    static PARTS = {
-        header: { template: 'systems/daggerheart/templates/sheets/activeEffect/header.hbs' },
-        tabs: { template: 'templates/generic/tab-navigation.hbs' },
-        details: { template: 'systems/daggerheart/templates/sheets/activeEffect/details.hbs', scrollable: [''] },
-        settings: { template: 'systems/daggerheart/templates/sheets/activeEffect/settings.hbs' },
-        changes: {
-            template: 'systems/daggerheart/templates/sheets/activeEffect/changes.hbs',
-            scrollable: ['ol[data-changes]']
-        },
-        footer: { template: 'systems/daggerheart/templates/sheets/global/tabs/tab-form-footer.hbs' }
-    };
-
-    static TABS = {
-        sheet: {
-            tabs: [
-                { id: 'details', icon: 'fa-solid fa-book' },
-                { id: 'settings', icon: 'fa-solid fa-bars', label: 'DAGGERHEART.GENERAL.Tabs.settings' },
-                { id: 'changes', icon: 'fa-solid fa-gears' }
-            ],
-            initial: 'details',
-            labelPrefix: 'EFFECT.TABS'
-        }
-    };
-
-    /**
-     * Get ChangeChoices for the changes autocomplete. Static for use in this class aswell as in settings-active-effect-config.mjs
-     * @returns {ChangeChoice { value: string, label: string, hint: string, group: string }[]}
-     */
-    static getChangeChoices() {
         const ignoredActorKeys = ['config', 'DhEnvironment', 'DhParty'];
 
         const getAllLeaves = (root, group, parentPath = '') => {
@@ -59,7 +23,7 @@ export default class DhActiveEffectConfig extends foundry.applications.sheets.Ac
 
             return leaves;
         };
-        return Object.keys(game.system.api.models.actors).reduce((acc, key) => {
+        this.changeChoices = Object.keys(game.system.api.models.actors).reduce((acc, key) => {
             if (ignoredActorKeys.includes(key)) return acc;
 
             const model = game.system.api.models.actors[key];
@@ -98,6 +62,34 @@ export default class DhActiveEffectConfig extends foundry.applications.sheets.Ac
         }, []);
     }
 
+    static DEFAULT_OPTIONS = {
+        classes: ['daggerheart', 'sheet', 'dh-style']
+    };
+
+    static PARTS = {
+        header: { template: 'systems/daggerheart/templates/sheets/activeEffect/header.hbs' },
+        tabs: { template: 'templates/generic/tab-navigation.hbs' },
+        details: { template: 'systems/daggerheart/templates/sheets/activeEffect/details.hbs', scrollable: [''] },
+        settings: { template: 'systems/daggerheart/templates/sheets/activeEffect/settings.hbs' },
+        changes: {
+            template: 'systems/daggerheart/templates/sheets/activeEffect/changes.hbs',
+            scrollable: ['ol[data-changes]']
+        },
+        footer: { template: 'systems/daggerheart/templates/sheets/global/tabs/tab-form-footer.hbs' }
+    };
+
+    static TABS = {
+        sheet: {
+            tabs: [
+                { id: 'details', icon: 'fa-solid fa-book' },
+                { id: 'settings', icon: 'fa-solid fa-bars', label: 'DAGGERHEART.GENERAL.Tabs.settings' },
+                { id: 'changes', icon: 'fa-solid fa-gears' }
+            ],
+            initial: 'details',
+            labelPrefix: 'EFFECT.TABS'
+        }
+    };
+
     _attachPartListeners(partId, htmlElement, options) {
         super._attachPartListeners(partId, htmlElement, options);
         const changeChoices = this.changeChoices;
diff --git a/module/applications/sheets-configs/setting-active-effect-config.mjs b/module/applications/sheets-configs/setting-active-effect-config.mjs
index 12ac90d1..fe36e37f 100644
--- a/module/applications/sheets-configs/setting-active-effect-config.mjs
+++ b/module/applications/sheets-configs/setting-active-effect-config.mjs
@@ -7,7 +7,19 @@ export default class SettingActiveEffectConfig extends HandlebarsApplicationMixi
         super({});
 
         this.effect = foundry.utils.deepClone(effect);
-        this.changeChoices = game.system.api.applications.sheetConfigs.ActiveEffectConfig.getChangeChoices();
+        const ignoredActorKeys = ['config', 'DhEnvironment'];
+        this.changeChoices = Object.keys(game.system.api.models.actors).reduce((acc, key) => {
+            if (!ignoredActorKeys.includes(key)) {
+                const model = game.system.api.models.actors[key];
+                const attributes = CONFIG.Token.documentClass.getTrackedAttributes(model);
+                const group = game.i18n.localize(model.metadata.label);
+                const choices = CONFIG.Token.documentClass
+                    .getTrackedAttributeChoices(attributes, model)
+                    .map(x => ({ ...x, group: group }));
+                acc.push(...choices);
+            }
+            return acc;
+        }, []);
     }
 
     static DEFAULT_OPTIONS = {
diff --git a/module/applications/sheets-configs/setting-feature-config.mjs b/module/applications/sheets-configs/setting-feature-config.mjs
index 28e686ea..e8bf6109 100644
--- a/module/applications/sheets-configs/setting-feature-config.mjs
+++ b/module/applications/sheets-configs/setting-feature-config.mjs
@@ -73,11 +73,9 @@ export default class SettingFeatureConfig extends HandlebarsApplicationMixin(App
         return context;
     }
 
-    static async updateData(_event, _element, formData) {
+    static async updateData(event, element, formData) {
         const data = foundry.utils.expandObject(formData.object);
-        await this.updateMove({
-            [`${this.movePath}`]: data
-        });
+        foundry.utils.mergeObject(this.move, data);
 
         this.render();
     }
@@ -137,7 +135,9 @@ export default class SettingFeatureConfig extends HandlebarsApplicationMixin(App
                 }
             );
 
-        await this.updateMove({ [`${this.actionsPath}.${action.id}`]: action });
+        await this.settings.updateSource({ [`${this.actionsPath}.${action.id}`]: action });
+        this.move = foundry.utils.getProperty(this.settings, this.movePath);
+
         this.render();
     }
 
@@ -150,12 +150,13 @@ export default class SettingFeatureConfig extends HandlebarsApplicationMixin(App
                 await game.system.api.applications.sheetConfigs.SettingActiveEffectConfig.configure(effect);
             if (!updatedEffect) return;
 
-            await this.updateMove({
+            await this.settings.updateSource({
                 [`${this.movePath}.effects`]: this.move.effects.reduce((acc, effect, index) => {
                     acc.push(index === effectIndex ? { ...updatedEffect, id: effect.id } : effect);
                     return acc;
                 }, [])
             });
+            this.move = foundry.utils.getProperty(this.settings, this.movePath);
             this.render();
         } else {
             const action = this.move.actions.get(id);
@@ -170,13 +171,13 @@ export default class SettingFeatureConfig extends HandlebarsApplicationMixin(App
                         : existingEffectIndex === -1
                           ? [...currentEffects, effectData]
                           : currentEffects.with(existingEffectIndex, effectData);
-                    await this.updateMove({
+                    await this.settings.updateSource({
                         [`${this.movePath}.effects`]: updatedEffects
                     });
                 }
 
-                await this.updateMove({ [`${this.actionsPath}.${id}`]: updatedMove });
-
+                await this.settings.updateSource({ [`${this.actionsPath}.${id}`]: updatedMove });
+                this.move = foundry.utils.getProperty(this.settings, this.movePath);
                 this.render();
                 return updatedEffects;
             }).render(true);
@@ -198,34 +199,31 @@ export default class SettingFeatureConfig extends HandlebarsApplicationMixin(App
                     });
                 }
             }
-            await this.updateMove({
+            await this.settings.updateSource({
                 [this.movePath]: {
                     effects: move.effects.filter(x => x.id !== id),
                     actions: move.actions
                 }
             });
         } else {
-            await this.updateMove({ [`${this.actionsPath}.-=${target.dataset.id}`]: null });
+            await this.settings.updateSource({ [`${this.actionsPath}.-=${target.dataset.id}`]: null });
         }
 
+        this.move = foundry.utils.getProperty(this.settings, this.movePath);
         this.render();
     }
 
-    static async addEffect() {
+    static async addEffect(_, target) {
         const currentEffects = foundry.utils.getProperty(this.settings, `${this.movePath}.effects`);
-
-        await this.updateMove({
+        await this.settings.updateSource({
             [`${this.movePath}.effects`]: [
                 ...currentEffects,
                 game.system.api.data.activeEffects.BaseEffect.getDefaultObject()
             ]
         });
-        this.render();
-    }
 
-    async updateMove(update) {
-        await this.settings.updateSource(update);
         this.move = foundry.utils.getProperty(this.settings, this.movePath);
+        this.render();
     }
 
     static resetMoves() {}
diff --git a/module/dice/damageRoll.mjs b/module/dice/damageRoll.mjs
index 0c9d5e41..cd26eb21 100644
--- a/module/dice/damageRoll.mjs
+++ b/module/dice/damageRoll.mjs
@@ -33,7 +33,7 @@ export default class DamageRoll extends DHRoll {
     static async buildPost(roll, config, message) {
         const chatMessage = config.source?.message
             ? ui.chat.collection.get(config.source.message)
-            : getDocumentClass('ChatMessage').applyRollMode({}, config.rollMode ?? CONST.DICE_ROLL_MODES.PUBLIC);
+            : getDocumentClass('ChatMessage').applyRollMode({}, config.rollMode);
         if (game.modules.get('dice-so-nice')?.active) {
             const pool = foundry.dice.terms.PoolTerm.fromRolls(
                     Object.values(config.damage).flatMap(r => r.parts.map(p => p.roll))
@@ -46,14 +46,9 @@ export default class DamageRoll extends DHRoll {
                 chatMessage.whisper?.length > 0 ? chatMessage.whisper : null,
                 chatMessage.blind
             );
-            config.mute = true;
         }
         await super.buildPost(roll, config, message);
-        if (config.source?.message) {
-            chatMessage.update({ 'system.damage': config.damage });
-
-            if (!game.modules.get('dice-so-nice')?.active) foundry.audio.AudioHelper.play({ src: CONFIG.sounds.dice });
-        }
+        if (config.source?.message) chatMessage.update({ 'system.damage': config.damage });
     }
 
     static unifyDamageRoll(rolls) {
diff --git a/styles/less/ui/chat/chat.less b/styles/less/ui/chat/chat.less
index 3591fc65..1e723ed7 100644
--- a/styles/less/ui/chat/chat.less
+++ b/styles/less/ui/chat/chat.less
@@ -158,7 +158,7 @@
 .daggerheart,
 #chat-notifications {
     .chat-message {
-        --text-color: light-dark(@dark-blue, @golden);
+        --text-color: @golden;
         --bg-color: @golden-40;
 
         [data-use-perm='false'] {
@@ -233,7 +233,7 @@
                 font-family: @font-subtitle;
                 font-size: var(--font-size-18);
                 font-weight: bold;
-                color: var(--text-color);
+                color: light-dark(@dark-blue, var(--text-color));
                 margin-bottom: -2px;
             }