diff --git a/lang/en.json b/lang/en.json
index 1766b218..feeb65b2 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -198,10 +198,7 @@
                     "type": { "label": "Type" }
                 },
                 "hordeDamage": "Horde Damage",
-                "horderHp": "Horde/HP",
-                "adversaryReactionRoll": {
-                    "headerTitle": "Adversary Reaction Roll"
-                }
+                "horderHp": "Horde/HP"
             },
             "Character": {
                 "advantageSources": {
@@ -443,10 +440,6 @@
                 "defaultOwnershipTooltip": "The default player ownership of countdowns",
                 "hideNewCountdowns": "Hide New Countdowns"
             },
-            "CreateItemDialog": {
-                "createItem": "Create Item",
-                "browseCompendium": "Browse Compendium"
-            },
             "DaggerheartMenu": {
                 "title": "GM Tools",
                 "refreshFeatures": "Refresh Features"
@@ -660,12 +653,6 @@
                 "noPlayers": "No players to assign ownership to",
                 "default": "Default Ownership"
             },
-            "PendingReactionsDialog": {
-                "title": "Pending Reaction Rolls Found",
-                "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}"
             },
@@ -697,13 +684,7 @@
                 "damageNotRolled": "Damage not rolled in chat message yet",
                 "insufficientHope": "The initiating character doesn't have enough hope",
                 "createTagTeam": "Create TagTeam Roll",
-                "chatMessageRollTitle": "Roll",
-                "cancelConfirmTitle": "Cancel Tag Team Roll",
-                "cancelConfirmText": "Are you sure you want to cancel the Tag Team Roll? This will close it for all other players too.",
-                "hints": {
-                    "completeRolls": "Set up and complete the rolls for the characters",
-                    "selectRoll": "Select which roll value to be used for the Tag Team"
-                }
+                "chatMessageRollTitle": "Roll"
             },
             "TokenConfig": {
                 "actorSizeUsed": "Actor size is set, determining the dimensions"
@@ -1234,11 +1215,6 @@
                 "on": "On",
                 "onWithToggle": "On With Toggle"
             },
-            "SceneRangeMeasurementTypes": {
-                "disable": "Disable Daggerheart Range Measurement",
-                "default": "Default",
-                "custom": "Custom"
-            },
             "SelectAction": {
                 "selectType": "Select Action Type",
                 "selectAction": "Action Selection"
@@ -2329,7 +2305,6 @@
             "multiclass": "Multiclass",
             "newCategory": "New Category",
             "newThing": "New {thing}",
-            "next": "Next",
             "none": "None",
             "noTarget": "No current target",
             "partner": "Partner",
@@ -2357,7 +2332,6 @@
             "scalable": "Scalable",
             "scars": "Scars",
             "situationalBonus": "Situational Bonus",
-            "searchPlaceholder": "Search...",
             "spent": "Spent",
             "step": "Step",
             "stress": "Stress",
@@ -2941,9 +2915,6 @@
                 "resourceRoll": {
                     "playerMessage": "{user} rerolled their {name}"
                 },
-                "saveRoll": {
-                    "reactionRollAllTargets": "Reaction Roll All Targets"
-                },
                 "tagTeam": {
                     "title": "Tag Team",
                     "membersTitle": "Members"
@@ -2972,6 +2943,7 @@
                 "title": "Daggerheart Compendium Browser",
                 "hint": "Select a Folder in sidebar to start browsing through the compendium",
                 "browserSettings": "Browser Settings",
+                "searchPlaceholder": "Search...",
                 "columnName": "Name",
                 "tooltipFilters": "Filters",
                 "tooltipErase": "Erase",
@@ -3007,7 +2979,7 @@
                     "weapons": "Weapons",
                     "armors": "Armors",
                     "consumables": "Consumables",
-                    "loots": "Loot"
+                    "loots": "Loots"
                 }
             },
             "Notifications": {
@@ -3098,7 +3070,6 @@
                     "companion": "Level {level} - {partner}",
                     "companionNoPartner": "No Partner",
                     "duplicateToNewTier": "Duplicate to New Tier",
-                    "createAdversary": "Create Adversary",
                     "pickTierTitle": "Pick a new tier for this adversary"
                 },
                 "daggerheartMenu": {
diff --git a/module/applications/settings/appearanceSettings.mjs b/module/applications/settings/appearanceSettings.mjs
index 64e5a076..151648e1 100644
--- a/module/applications/settings/appearanceSettings.mjs
+++ b/module/applications/settings/appearanceSettings.mjs
@@ -118,13 +118,8 @@ export default class DHAppearanceSettings extends HandlebarsApplicationMixin(App
                 break;
             case 'footer':
                 partContext.buttons = [
-                    {
-                        type: 'button',
-                        action: 'reset',
-                        icon: 'fa-solid fa-arrow-rotate-left',
-                        label: game.i18n.localize('ACTIONS.Reset')
-                    },
-                    { type: 'submit', icon: 'fa-solid fa-floppy-disk', label: game.i18n.localize('EDITOR.Save') }
+                    { type: 'button', action: 'reset', icon: 'fa-solid fa-arrow-rotate-left', label: 'Reset' },
+                    { type: 'submit', icon: 'fa-solid fa-floppy-disk', label: 'Save Changes' }
                 ];
                 break;
         }
diff --git a/module/applications/sheets/actors/adversary.mjs b/module/applications/sheets/actors/adversary.mjs
index 04be3efb..d8a3df29 100644
--- a/module/applications/sheets/actors/adversary.mjs
+++ b/module/applications/sheets/actors/adversary.mjs
@@ -217,8 +217,8 @@ export default class AdversarySheet extends DHBaseActorSheet {
     static #reactionRoll(event) {
         const config = {
             event,
-            title: game.i18n.localize('DAGGERHEART.GENERAL.reactionRoll'),
-            headerTitle: game.i18n.localize('DAGGERHEART.ACTORS.Adversary.adversaryReactionRoll.headerTitle'),
+            title: `Reaction Roll: ${this.actor.name}`,
+            headerTitle: 'Adversary Reaction Roll',
             roll: {
                 type: 'trait'
             },
diff --git a/module/applications/sheets/actors/party.mjs b/module/applications/sheets/actors/party.mjs
index 53316c8b..1b1722db 100644
--- a/module/applications/sheets/actors/party.mjs
+++ b/module/applications/sheets/actors/party.mjs
@@ -229,7 +229,7 @@ export default class Party extends DHBaseActorSheet {
                 title: game.i18n.localize(`DAGGERHEART.APPLICATIONS.Downtime.${button.dataset.type}.title`),
                 icon: button.dataset.type === 'shortRest' ? 'fa-solid fa-utensils' : 'fa-solid fa-bed'
             },
-            content: game.i18n.localize('DAGGERHEART.ACTORS.Party.triggerRestContent'),
+            content: 'This will trigger a dialog to players make their downtime moves, are you sure?',
             classes: ['daggerheart', 'dialog', 'dh-style']
         });
 
diff --git a/module/applications/sheets/api/application-mixin.mjs b/module/applications/sheets/api/application-mixin.mjs
index baa4d173..b18176ec 100644
--- a/module/applications/sheets/api/application-mixin.mjs
+++ b/module/applications/sheets/api/application-mixin.mjs
@@ -652,12 +652,12 @@ export default function DHApplicationMixin(Base) {
                 buttons: [
                     {
                         action: 'create',
-                        label: game.i18n.localize('DAGGERHEART.APPLICATIONS.CreateItemDialog.createItem'),
+                        label: 'Create Item',
                         icon: 'fa-solid fa-plus'
                     },
                     {
                         action: 'browse',
-                        label: game.i18n.localize('DAGGERHEART.APPLICATIONS.CreateItemDialog.browseCompendium'),
+                        label: 'Browse Compendium',
                         icon: 'fa-solid fa-book'
                     }
                 ]
diff --git a/module/applications/sidebar/tabs/actorDirectory.mjs b/module/applications/sidebar/tabs/actorDirectory.mjs
index e9484553..9d8f16e1 100644
--- a/module/applications/sidebar/tabs/actorDirectory.mjs
+++ b/module/applications/sidebar/tabs/actorDirectory.mjs
@@ -76,7 +76,7 @@ export default class DhActorDirectory extends foundry.applications.sidebar.tabs.
                     window: { title: 'DAGGERHEART.UI.Sidebar.actorDirectory.pickTierTitle' },
                     content,
                     ok: {
-                        label: 'DAGGERHEART.UI.Sidebar.actorDirectory.createAdversary',
+                        label: 'Create Adversary',
                         callback: (event, button, dialog) => Number(button.form.elements.tier.value)
                     }
                 });
diff --git a/module/applications/ui/fearTracker.mjs b/module/applications/ui/fearTracker.mjs
index 4e5e1132..82dda215 100644
--- a/module/applications/ui/fearTracker.mjs
+++ b/module/applications/ui/fearTracker.mjs
@@ -22,7 +22,7 @@ export default class FearTracker extends HandlebarsApplicationMixin(ApplicationV
         tag: 'div',
         window: {
             frame: true,
-            title: 'DAGGERHEART.GENERAL.fear',
+            title: 'Fear',
             positioned: true,
             resizable: true,
             minimizable: false
diff --git a/module/applications/ui/itemBrowser.mjs b/module/applications/ui/itemBrowser.mjs
index 9ca328a0..2d2e8cdc 100644
--- a/module/applications/ui/itemBrowser.mjs
+++ b/module/applications/ui/itemBrowser.mjs
@@ -207,23 +207,8 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
             label: game.i18n.localize(col.label)
         }));
 
-        const splitPath = folderId?.split('.') ?? [];
-        const { pathLabels } = splitPath.reduce(
-            (acc, curr) => {
-                acc.currentPath = !acc.currentPath ? curr : [acc.currentPath, curr].join('.');
-                if (curr === 'folder') return acc;
-
-                const label = foundry.utils.getProperty(this.config, acc.currentPath)?.label;
-                if (label) acc.pathLabels.push(game.i18n.localize(label));
-
-                return acc;
-            },
-            { pathLabels: [], currentPath: '' }
-        );
-
         this.selectedMenu = {
-            path: splitPath,
-            pathLabels: pathLabels,
+            path: folderId?.split('.') ?? [],
             data: {
                 ...folderData,
                 columns: columns
diff --git a/module/applications/ux/filter-menu.mjs b/module/applications/ux/filter-menu.mjs
index 791c0e1f..065d08f9 100644
--- a/module/applications/ux/filter-menu.mjs
+++ b/module/applications/ux/filter-menu.mjs
@@ -188,7 +188,7 @@ export default class FilterMenu extends foundry.applications.ux.ContextMenu {
         }));
 
         const damageTypeFilter = Object.values(CONFIG.DH.GENERAL.damageTypes).map(({ id, abbreviation }) => ({
-            group: game.i18n.localize('DAGGERHEART.GENERAL.damageType'),
+            group: 'Damage Type', //TODO localize
             name: game.i18n.localize(abbreviation),
             filter: {
                 field: 'system.damage.type',
diff --git a/module/config/generalConfig.mjs b/module/config/generalConfig.mjs
index 2557e562..f1c21d26 100644
--- a/module/config/generalConfig.mjs
+++ b/module/config/generalConfig.mjs
@@ -943,14 +943,14 @@ export const countdownAppMode = {
 export const sceneRangeMeasurementSetting = {
     disable: {
         id: 'disable',
-        label: 'DAGGERHEART.CONFIG.SceneRangeMeasurementTypes.disable'
+        label: 'Disable Daggerheart Range Measurement'
     },
     default: {
         id: 'default',
-        label: 'DAGGERHEART.CONFIG.SceneRangeMeasurementTypes.default'
+        label: 'Default'
     },
     custom: {
         id: 'custom',
-        label: 'DAGGERHEART.CONFIG.SceneRangeMeasurementTypes.custom'
+        label: 'Custom'
     }
 };
diff --git a/module/config/itemBrowserConfig.mjs b/module/config/itemBrowserConfig.mjs
index 0a4154a8..3b10409c 100644
--- a/module/config/itemBrowserConfig.mjs
+++ b/module/config/itemBrowserConfig.mjs
@@ -7,12 +7,7 @@ export const typeConfig = {
             },
             {
                 key: 'system.type',
-                label: 'DAGGERHEART.GENERAL.type',
-                format: type => {
-                    if (!type) return '-';
-
-                    return CONFIG.DH.ACTOR.allAdversaryTypes()[type].label;
-                }
+                label: 'DAGGERHEART.GENERAL.type'
             }
         ],
         filters: [
@@ -323,14 +318,7 @@ export const typeConfig = {
             },
             {
                 key: 'system.domains',
-                label: 'DAGGERHEART.GENERAL.Domain.plural',
-                format: domains => {
-                    const config = CONFIG.DH.DOMAIN.allDomains();
-                    return domains
-                        .map(x => (x ? game.i18n.localize(config[x].label) : null))
-                        .filter(x => x)
-                        .join(', ');
-                }
+                label: 'DAGGERHEART.GENERAL.Domain.plural'
             }
         ],
         filters: [
@@ -379,8 +367,7 @@ export const typeConfig = {
             },
             {
                 key: 'system.spellcastingTrait',
-                label: 'DAGGERHEART.ITEMS.Subclass.spellcastingTrait',
-                format: trait => (trait ? `DAGGERHEART.CONFIG.Traits.${trait}.name` : '-')
+                label: 'DAGGERHEART.ITEMS.Subclass.spellcastingTrait'
             }
         ],
         filters: [
diff --git a/module/config/settingsConfig.mjs b/module/config/settingsConfig.mjs
index 8036d789..c19e6e26 100644
--- a/module/config/settingsConfig.mjs
+++ b/module/config/settingsConfig.mjs
@@ -46,14 +46,18 @@ export const gameSettings = {
 export const actionAutomationChoices = {
     never: {
         id: 'never',
-        label: 'DAGGERHEART.CONFIG.ActionAutomationChoices.never'
+        label: 'Never'
     },
     showDialog: {
         id: 'showDialog',
-        label: 'DAGGERHEART.CONFIG.ActionAutomationChoices.showDialog'
+        label: 'Show Dialog only'
     },
+    // npcOnly: {
+    // id: "npcOnly",
+    // label: "Always for non-characters"
+    // },
     always: {
         id: 'always',
-        label: 'DAGGERHEART.CONFIG.ActionAutomationChoices.always'
+        label: 'Always'
     }
 };
diff --git a/module/data/fields/action/damageField.mjs b/module/data/fields/action/damageField.mjs
index 6c091f8b..6439344b 100644
--- a/module/data/fields/action/damageField.mjs
+++ b/module/data/fields/action/damageField.mjs
@@ -295,7 +295,7 @@ export class DHDamageData extends DHResourceData {
                     required: true
                 }),
                 {
-                    label: game.i18n.localize('DAGGERHEART.GENERAL.type')
+                    label: 'Type'
                 }
             )
         };
diff --git a/module/documents/chatMessage.mjs b/module/documents/chatMessage.mjs
index acc14439..53921329 100644
--- a/module/documents/chatMessage.mjs
+++ b/module/documents/chatMessage.mjs
@@ -197,8 +197,8 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
             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>${game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.confirmation')}</p><p><i>${game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.warning')}</i></p>`
+                    window: { title: 'Pending Reaction Rolls found' },
+                    content: `<p>Some Tokens still need to roll their Reaction Roll.</p><p>Are you sure you want to continue ?</p><p><i>Undone reaction rolls will be considered as failed</i></p>`
                 });
                 if (!confirm) return;
             }
diff --git a/styles/less/global/prose-mirror.less b/styles/less/global/prose-mirror.less
index fd699b66..506fb8b7 100644
--- a/styles/less/global/prose-mirror.less
+++ b/styles/less/global/prose-mirror.less
@@ -24,7 +24,7 @@
             }
             h4 {
                 font-size: var(--font-size-16);
-                color: light-dark(@dark, @beige);
+                color: @beige;
                 font-weight: 600;
             }
 
diff --git a/styles/less/ui/combat-sidebar/encounter-controls.less b/styles/less/ui/combat-sidebar/encounter-controls.less
index 66f265e0..16a8e11a 100644
--- a/styles/less/ui/combat-sidebar/encounter-controls.less
+++ b/styles/less/ui/combat-sidebar/encounter-controls.less
@@ -10,7 +10,6 @@
         .encounter-battlepoints {
             display: flex;
             cursor: help;
-            color: light-dark(@dark, @beige);
         }
 
         .inner-controls {
diff --git a/system.json b/system.json
index 4cbe0115..cc26de16 100644
--- a/system.json
+++ b/system.json
@@ -2,15 +2,12 @@
     "id": "daggerheart",
     "title": "Daggerheart",
     "description": "An unofficial implementation of the Daggerheart system",
-    "version": "1.9.9",
+    "version": "1.9.8",
     "compatibility": {
         "minimum": "13.346",
         "verified": "13.351",
         "maximum": "13"
     },
-    "url": "https://github.com/Foundryborne/daggerheart",
-    "manifest": "https://raw.githubusercontent.com/Foundryborne/daggerheart/V13/system.json",
-    "download": "https://github.com/Foundryborne/daggerheart/releases/download/1.9.9/system.zip",
     "authors": [
         {
             "name": "WBHarry"
@@ -299,5 +296,8 @@
     },
     "background": "systems/daggerheart/assets/logos/FoundrybornBackgroundLogo.png",
     "primaryTokenAttribute": "resources.hitPoints",
-    "secondaryTokenAttribute": "resources.stress"
+    "secondaryTokenAttribute": "resources.stress",
+    "url": "https://your/hosted/system/repo/",
+    "manifest": "https://your/hosted/system/repo/system.json",
+    "download": "https://your/packaged/download/archive.zip"
 }
diff --git a/templates/characterCreation/footer.hbs b/templates/characterCreation/footer.hbs
index 51eef110..95b86cfb 100644
--- a/templates/characterCreation/footer.hbs
+++ b/templates/characterCreation/footer.hbs
@@ -1,8 +1,8 @@
 <section class="creation-action-footer">
-    <button data-action="close">{{localize "COMMON.Cancel"}}</button>
+    <button data-action="close">{{localize "Cancel"}}</button>
     {{#if isLastTab}}
         <button data-action="finish">{{localize "DAGGERHEART.APPLICATIONS.CharacterCreation.finishCreation"}}</button>
     {{else}}
-        <button data-action="setupGoNext" {{disabled nextDisabled}}>{{localize "DAGGERHEART.GENERAL.next"}}</button>
+        <button data-action="setupGoNext" {{disabled nextDisabled}}>{{localize "Next"}}</button>
     {{/if}}
 </section>
\ No newline at end of file
diff --git a/templates/dialogs/characterReset.hbs b/templates/dialogs/characterReset.hbs
index 59f88437..298826e5 100644
--- a/templates/dialogs/characterReset.hbs
+++ b/templates/dialogs/characterReset.hbs
@@ -28,6 +28,6 @@
             </div>
         </fieldset>
 
-        <button type="button" data-action="finishSelection">{{localize "ACTIONS.Reset"}}</button>
+        <button type="button" data-action="finishSelection">{{localize "Reset"}}</button>
     </div>
 </div>
\ No newline at end of file
diff --git a/templates/dialogs/deathMove.hbs b/templates/dialogs/deathMove.hbs
index 97900022..341659df 100644
--- a/templates/dialogs/deathMove.hbs
+++ b/templates/dialogs/deathMove.hbs
@@ -17,7 +17,7 @@
     </div>
     <footer class="flexrow">
         <button data-action="close">
-            <span>{{localize "COMMON.Cancel"}}</span>
+            <span>{{localize "Cancel"}}</span>
         </button>
         <button data-action="takeMove" {{#if (not this.selectedMove)}}disabled{{/if}}>
             <span>
diff --git a/templates/dialogs/dice-roll/damageSelection.hbs b/templates/dialogs/dice-roll/damageSelection.hbs
index 29a5d6bf..c0dbae62 100644
--- a/templates/dialogs/dice-roll/damageSelection.hbs
+++ b/templates/dialogs/dice-roll/damageSelection.hbs
@@ -35,7 +35,7 @@
             </span>
         </div>
         <div class="form-group">
-            <input type="text" value="{{extraFormula}}" name="roll.{{ @index }}.extraFormula" placeholder="{{localize "DAGGERHEART.GENERAL.situationalBonus"}}">
+            <input type="text" value="{{extraFormula}}" name="roll.{{ @index }}.extraFormula" placeholder="Situational Bonus">
         </div>
     {{/each}}
     {{#unless (empty @root.modifiers)}}
diff --git a/templates/dialogs/dice-roll/rollSelection.hbs b/templates/dialogs/dice-roll/rollSelection.hbs
index 569f5e16..5139c58a 100644
--- a/templates/dialogs/dice-roll/rollSelection.hbs
+++ b/templates/dialogs/dice-roll/rollSelection.hbs
@@ -175,7 +175,7 @@
                             </select>
                         {{/if}}
                         {{#if (eq @root.rollType 'DualityRoll')}}<span class="formula-label">{{localize "DAGGERHEART.GENERAL.situationalBonus"}}</span>{{/if}}
-                        <input type="text" value="{{extraFormula}}" name="extraFormula" placeholder="{{#if (eq @root.rollType 'DualityRoll')}}Ex: 1d6 + 5{{else}}{{localize "DAGGERHEART.GENERAL.situationalBonus"}}{{/if}}">
+                        <input type="text" value="{{extraFormula}}" name="extraFormula" placeholder="{{#if (eq @root.rollType 'DualityRoll')}}Ex: 1d6 + 5{{else}}Situational Bonus{{/if}}">
                     </fieldset>
                 {{/if}}
             {{/unless}}
diff --git a/templates/dialogs/downtime/downtime.hbs b/templates/dialogs/downtime/downtime.hbs
index edaa81c1..9744ffea 100644
--- a/templates/dialogs/downtime/downtime.hbs
+++ b/templates/dialogs/downtime/downtime.hbs
@@ -28,7 +28,7 @@
     </fieldset>
 
     <footer>
-        <button type="button" data-action="close">{{localize "COMMON.Cancel"}}</button>
+        <button type="button" data-action="close">{{localize "Cancel"}}</button>
         <button type="button" data-action="takeDowntime" {{#if disabledDowntime}}disabled{{/if}}>{{localize "DAGGERHEART.APPLICATIONS.Downtime.takeDowntime"}}</button>
     </footer>
 </div>
\ No newline at end of file
diff --git a/templates/dialogs/image-select/footer.hbs b/templates/dialogs/image-select/footer.hbs
index 58a60cc4..cd7d3d1a 100644
--- a/templates/dialogs/image-select/footer.hbs
+++ b/templates/dialogs/image-select/footer.hbs
@@ -1,4 +1,4 @@
 <div class="footer">
-    <button data-action="close">{{localize "COMMON.Cancel"}}</button>
+    <button data-action="close">{{localize "Cancel"}}</button>
     <button type="button" data-action="finishSelection">{{localize "DAGGERHEART.APPLICATIONS.ImageSelect.selectImage"}}</button>
 </div>
\ No newline at end of file
diff --git a/templates/dialogs/multiclassChoice.hbs b/templates/dialogs/multiclassChoice.hbs
index 55365939..3c89ff1a 100644
--- a/templates/dialogs/multiclassChoice.hbs
+++ b/templates/dialogs/multiclassChoice.hbs
@@ -16,7 +16,7 @@
         </div>
 
         <footer>
-            <button data-action="close">{{localize "COMMON.Cancel"}}</button>
+            <button data-action="close">{{localize "Cancel"}}</button>
             <button data-action="save" {{disabled multiclassDisabled}}>{{localize "DAGGERHEART.GENERAL.multiclass"}}</button>
         </footer>
     </div>
diff --git a/templates/levelup/tabs/footer.hbs b/templates/levelup/tabs/footer.hbs
index d487e657..2ee7a316 100644
--- a/templates/levelup/tabs/footer.hbs
+++ b/templates/levelup/tabs/footer.hbs
@@ -20,7 +20,7 @@
     {{/if}}
     {{#unless levelupAuto}}
         <div class="levelup-footer">
-            <button type="button" data-action="close">{{localize "COMMON.Cancel"}}</button>
+            <button type="button" data-action="close">{{localize "Cancel"}}</button>
             <button type="button" data-action="save">{{localize "Save"}}</button>
         </div>
     {{/unless}}
diff --git a/templates/settings/automation-settings/footer.hbs b/templates/settings/automation-settings/footer.hbs
index 7e9d1991..54939c17 100644
--- a/templates/settings/automation-settings/footer.hbs
+++ b/templates/settings/automation-settings/footer.hbs
@@ -1,10 +1,10 @@
 <footer class="form-footer">
     <button data-action="reset">
         <i class="fa-solid fa-arrow-rotate-left"></i>
-        <span>{{localize "ACTIONS.Reset"}}</span>
+        <span>{{localize "Reset"}}</span>
     </button>
     <button data-action="save" >
         <i class="fa-solid fa-floppy-disk"></i>
-        <span>{{localize "EDITOR.Save"}}</span>
+        <span>{{localize "Save Changes"}}</span>
     </button>
 </footer>
\ No newline at end of file
diff --git a/templates/settings/downtime-config/footer.hbs b/templates/settings/downtime-config/footer.hbs
index 199aea15..5e5f31dd 100644
--- a/templates/settings/downtime-config/footer.hbs
+++ b/templates/settings/downtime-config/footer.hbs
@@ -1,4 +1,4 @@
 <section class='tab-form-footer spaced'>
-    <button data-action="close">{{localize "COMMON.Cancel"}}</button>
+    <button data-action="close">{{localize "Cancel"}}</button>
     <button data-action="saveForm"><i class="fa-solid fa-floppy-disk"></i> {{localize "Save"}}</button>
 </section>
\ No newline at end of file
diff --git a/templates/settings/homebrew-settings/footer.hbs b/templates/settings/homebrew-settings/footer.hbs
index ba1b5ada..954572de 100644
--- a/templates/settings/homebrew-settings/footer.hbs
+++ b/templates/settings/homebrew-settings/footer.hbs
@@ -1,10 +1,10 @@
  <footer class="form-footer">
     <button type="button" data-action="reset">
         <i class="fa-solid fa-arrow-rotate-left"></i>
-        <span>{{localize "ACTIONS.Reset"}}</span>
+        <span>{{localize "Reset"}}</span>
     </button>
     <button type="button" data-action="save" >
         <i class="fa-solid fa-floppy-disk"></i>
-        <span>{{localize "EDITOR.Save"}}</span>
+        <span>{{localize "Save Changes"}}</span>
     </button>
 </footer>
\ No newline at end of file
diff --git a/templates/settings/metagaming-settings/footer.hbs b/templates/settings/metagaming-settings/footer.hbs
index 7e9d1991..54939c17 100644
--- a/templates/settings/metagaming-settings/footer.hbs
+++ b/templates/settings/metagaming-settings/footer.hbs
@@ -1,10 +1,10 @@
 <footer class="form-footer">
     <button data-action="reset">
         <i class="fa-solid fa-arrow-rotate-left"></i>
-        <span>{{localize "ACTIONS.Reset"}}</span>
+        <span>{{localize "Reset"}}</span>
     </button>
     <button data-action="save" >
         <i class="fa-solid fa-floppy-disk"></i>
-        <span>{{localize "EDITOR.Save"}}</span>
+        <span>{{localize "Save Changes"}}</span>
     </button>
 </footer>
\ No newline at end of file
diff --git a/templates/settings/variant-rules.hbs b/templates/settings/variant-rules.hbs
index 31316dc6..df7accb3 100644
--- a/templates/settings/variant-rules.hbs
+++ b/templates/settings/variant-rules.hbs
@@ -32,11 +32,11 @@
     <footer class="form-footer">
         <button data-action="reset">
             <i class="fa-solid fa-arrow-rotate-left"></i>
-            <span>{{localize "ACTIONS.ResetReset"}}</span>
+            <span>{{localize "Reset"}}</span>
         </button>
         <button data-action="save" >
             <i class="fa-solid fa-floppy-disk"></i>
-            <span>{{localize "EDITOR.Save"}}</span>
+            <span>{{localize "Save Changes"}}</span>
         </button>
     </footer>
 </div>
diff --git a/templates/sheets/actors/character/inventory.hbs b/templates/sheets/actors/character/inventory.hbs
index 711d0c9f..a05fed35 100644
--- a/templates/sheets/actors/character/inventory.hbs
+++ b/templates/sheets/actors/character/inventory.hbs
@@ -5,7 +5,7 @@
             <div class="icon">
                 <i class="fa-solid fa-magnifying-glass"></i>
             </div>
-            <input type="search" name="search" class="search-inventory" placeholder="{{localize "DAGGERHEART.GENERAL.searchPlaceholder"}}">
+            <input type="search" name="search" class="search-inventory" placeholder="Search...">
         </div>
         <a class="filter-button">
             <i class="fa-solid fa-filter"></i>
diff --git a/templates/sheets/actors/character/loadout.hbs b/templates/sheets/actors/character/loadout.hbs
index 5e4c9f54..0319d56f 100644
--- a/templates/sheets/actors/character/loadout.hbs
+++ b/templates/sheets/actors/character/loadout.hbs
@@ -5,7 +5,7 @@
             <div class="icon">
                 <i class="fa-solid fa-magnifying-glass"></i>
             </div>
-            <input type="search" name="search" class="search-loadout" placeholder="{{localize "DAGGERHEART.GENERAL.searchPlaceholder"}}">
+            <input type="search" name="search" class="search-loadout" placeholder="Search...">
         </div>
         <a class="filter-button">
             <i class="fa-solid fa-filter"></i>
diff --git a/templates/sheets/actors/party/inventory.hbs b/templates/sheets/actors/party/inventory.hbs
index 186e2e99..92371b8d 100644
--- a/templates/sheets/actors/party/inventory.hbs
+++ b/templates/sheets/actors/party/inventory.hbs
@@ -5,7 +5,7 @@
             <div class="icon">
                 <i class="fa-solid fa-magnifying-glass"></i>
             </div>
-            <input type="search" name="search" class="search-inventory" placeholder="{{localize "DAGGERHEART.GENERAL.searchPlaceholder"}}">
+            <input type="search" name="search" class="search-inventory" placeholder="Search...">
         </div>
         <a class="filter-button">
             <i class="fa-solid fa-filter"></i>
diff --git a/templates/sheets/actors/party/party-members.hbs b/templates/sheets/actors/party/party-members.hbs
index 84e0cddf..b5903cfc 100644
--- a/templates/sheets/actors/party/party-members.hbs
+++ b/templates/sheets/actors/party/party-members.hbs
@@ -7,11 +7,11 @@
     <div class="actions-section">
         <button data-action="tagTeamRoll">
             <i class="fa-solid fa-user-group"></i>
-            <span>{{localize "DAGGERHEART.APPLICATIONS.TagTeamSelect.title"}}</span>
+            <span>Tag Team Roll</span>
         </button>
         <button data-action="groupRoll">
             <i class="fa-solid fa-users"></i>
-            <span>{{localize "DAGGERHEART.APPLICATIONS.GroupRollSelect.title"}}</span>
+            <span>Group Roll</span>
         </button>
         {{!-- NOT YET IMPLEMENTED --}}
         {{!-- <button>
diff --git a/templates/ui/chat/parts/target-part.hbs b/templates/ui/chat/parts/target-part.hbs
index 88d337ac..9a545926 100644
--- a/templates/ui/chat/parts/target-part.hbs
+++ b/templates/ui/chat/parts/target-part.hbs
@@ -24,7 +24,7 @@
                         <div class="roll-part-header"><div></div></div>
                     </div>
                 {{/if}}
-                {{#if (and hasSave currentTargets.length)}}<div class="roll-part-extra roll-all-save-button">{{localize "DAGGERHEART.UI.Chat.saveRoll.reactionRollAllTargets"}}<i class="fa-solid fa-shield fa-lg"></i></div>{{/if}}
+                {{#if (and hasSave currentTargets.length)}}<div class="roll-part-extra roll-all-save-button">Reaction Roll All Targets<i class="fa-solid fa-shield fa-lg"></i></div>{{/if}}
                 {{#each currentTargets}}
                     <div class="roll-target" data-token="{{id}}">
                         <img class="target-img" src="{{img}}">
diff --git a/templates/ui/itemBrowser/itemBrowser.hbs b/templates/ui/itemBrowser/itemBrowser.hbs
index d4946c1f..137693fc 100644
--- a/templates/ui/itemBrowser/itemBrowser.hbs
+++ b/templates/ui/itemBrowser/itemBrowser.hbs
@@ -1,14 +1,14 @@
 <div class="compendium-results">
     {{#if menu.path.length }}
         <div class="menu-path">
-            {{#each menu.pathLabels}}
-                {{#unless @first}}
+            {{#each menu.path}}
+                {{#if (eq this "folders")}}
                     <span class="path-link">
                         /
                     </span>
-                {{/unless}}
-
-                <span class="item-path">{{this}}</span>
+                {{else}}
+                    <span class="item-path">{{this}}</span>
+                {{/if}}
             {{/each}}
         </div>
         <div class="item-filter">
@@ -17,7 +17,7 @@
                     <div class="icon">
                         <i class="fa-solid fa-magnifying-glass"></i>
                     </div>
-                    <input type="search" name="search" class="search-input" placeholder="{{localize 'DAGGERHEART.GENERAL.searchPlaceholder'}}">
+                    <input type="search" name="search" class="search-input" placeholder="{{localize 'DAGGERHEART.UI.ItemBrowser.searchPlaceholder'}}">
                 </div>
                 <a data-tooltip="{{localize 'DAGGERHEART.UI.ItemBrowser.tooltipFilters'}}" data-action="expandContent" disabled><i class="fa-solid fa-filter"></i></a>
                 <a data-tooltip="{{localize 'DAGGERHEART.UI.ItemBrowser.tooltipErase'}}" data-action="resetFilters"><i class="fa-solid fa-eraser"></i></a>
diff --git a/templates/ui/tooltip/action.hbs b/templates/ui/tooltip/action.hbs
index 959188f3..29d44dde 100644
--- a/templates/ui/tooltip/action.hbs
+++ b/templates/ui/tooltip/action.hbs
@@ -16,7 +16,7 @@
         {{#if (gt item.cost.length 0)}}
             {{#each item.cost as | cost |}}
                 <div class="tag">
-                  <span>{{localize "DAGGERHEART.GENERAL.type"}} {{#with (lookup @root.config.GENERAL.abilityCosts cost.type) as | type |}}{{localize type.label}}{{/with}}</span>
+                  <span>{{localize "Type"}} {{#with (lookup @root.config.GENERAL.abilityCosts cost.type) as | type |}}{{localize type.label}}{{/with}}</span>
                 </div>
                 <div class="tag">
                   <span>{{localize "DAGGERHEART.GENERAL.value"}} {{cost.value}}</span>
diff --git a/templates/ui/tooltip/adversary.hbs b/templates/ui/tooltip/adversary.hbs
index f96fe2a0..bba7e696 100644
--- a/templates/ui/tooltip/adversary.hbs
+++ b/templates/ui/tooltip/adversary.hbs
@@ -11,7 +11,7 @@
             {{/with}}
         </div>
         <div class="tooltip-information">
-            <label>{{localize "DAGGERHEART.GENERAL.type"}}</label>
+            <label>{{localize "Type"}}</label>
             {{#with (lookup adversaryTypes item.system.type) as | type |}}
                 <div>{{localize type.label}}</div>
             {{/with}}
diff --git a/templates/ui/tooltip/battlepoints.hbs b/templates/ui/tooltip/battlepoints.hbs
index 9672698a..d793fe8c 100644
--- a/templates/ui/tooltip/battlepoints.hbs
+++ b/templates/ui/tooltip/battlepoints.hbs
@@ -1,6 +1,6 @@
 <div class="daggerheart dh-style tooltip">
     
-    <div class="tooltip-header"><h2>{{localize "DAGGERHEART.GENERAL.Adversary.plural"}} ({{currentBP}}/{{maxBP}})</h2></div>
+    <div class="tooltip-header"><h2>{{localize "Adversaries"}} ({{currentBP}}/{{maxBP}})</h2></div>
     <div class="battlepoint-categories-container">
         <div class="battlepoint-categories-inner-container">
             {{#each categories as |category key|}}
@@ -17,7 +17,7 @@
         </div>
     </div>
 
-    <div class="tooltip-header"><h2>{{localize "DAGGERHEART.GENERAL.Modifier.plural"}}</h2></div>
+    <div class="tooltip-header"><h2>{{localize "Modifiers"}}</h2></div>
     <div class="battlepoint-toggles-container">
         {{#each toggles as |toggle|}}
             <div class="battlepoint-toggle-container {{#if (and toggle.disabled (not toggle.checked))}}inactive{{/if}}">