diff --git a/lang/en.json b/lang/en.json
index 6a0d72d1..d2386744 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -386,7 +386,8 @@
                 "hideNewCountdowns": "Hide New Countdowns"
             },
             "DaggerheartMenu": {
-                "title": "GM Tools"
+                "title": "GM Tools",
+                "refreshFeatures": "Refresh Features"
             },
             "DeleteConfirmation": {
                 "title": "Delete {type} - {name}",
@@ -504,6 +505,7 @@
                 },
                 "navigateLevel": "To Level {level}",
                 "navigateToLevelup": "Return To Levelup",
+                "finishLevelup": "Finish Levelup",
                 "navigateToSummary": "To Summary",
                 "options": {
                     "trait": "Gain a +1 bonus to two unmarked character traits and mark them.",
@@ -2105,6 +2107,7 @@
             },
             "hope": "Hope",
             "hordeHp": "Horde HP",
+            "icon": "Icon",
             "identify": "Identity",
             "imagePath": "Image Path",
             "inactiveEffects": "Inactive Effects",
@@ -2141,6 +2144,7 @@
             "recovery": "Recovery",
             "refresh": "Refresh",
             "reroll": "Reroll",
+            "rerolled": "Rerolled",
             "rerollThing": "Reroll {thing}",
             "resource": "Resource",
             "roll": "Roll",
@@ -2240,7 +2244,9 @@
                 "evolvedDrag": "Drag a form here to evolve it.",
                 "hybridize": "Hybridize",
                 "hybridizeFeatureTitle": "Hybrid Features",
-                "hybridizeDrag": "Drag a form here to hybridize it."
+                "hybridizeDrag": "Drag a form here to hybridize it.",
+                "mainTrait": "Main Trait",
+                "traitBonus": "Trait Bonus"
             },
             "Class": {
                 "hopeFeatures": "Hope Features",
@@ -2583,7 +2589,8 @@
                     "selectMember": "Select a Member",
                     "rerollTitle": "Reroll Group Roll",
                     "rerollContent": "Are you sure you want to reroll your {trait} check?",
-                    "rerollTooltip": "Reroll"
+                    "rerollTooltip": "Reroll",
+                    "wholePartySelected": "The whole party is selected"
                 },
                 "healingRoll": {
                     "title": "Heal - {damage}",
diff --git a/templates/characterCreation/tabs/traits.hbs b/templates/characterCreation/tabs/traits.hbs
index bf32dd16..7bbf4b52 100644
--- a/templates/characterCreation/tabs/traits.hbs
+++ b/templates/characterCreation/tabs/traits.hbs
@@ -14,7 +14,7 @@
                             <div class="suggested-trait-container">{{this}}</div>
                         {{/each}}
                     </div>
-                    <button class="action-button" data-action="useSuggestedTraits">{{localize "Use"}}</button>
+                    <button class="action-button" data-action="useSuggestedTraits">{{localize "DAGGERHEART.GENERAL.use"}}</button>
                 </fieldset>
                 <div class="traits-inner-container">
                     {{#each traits.values}}
diff --git a/templates/dialogs/damageReduction.hbs b/templates/dialogs/damageReduction.hbs
index df7d8332..57d7ee61 100644
--- a/templates/dialogs/damageReduction.hbs
+++ b/templates/dialogs/damageReduction.hbs
@@ -93,13 +93,13 @@
 
     <footer class="padded">
         <button type="button" data-action="takeDamage">
-            {{localize "Take"}}
+            {{localize "DAGGERHEART.GENERAL.take"}}
             <div class="damage-value {{#if this.reducedDamage}}reduced-value{{/if}}">{{this.damage}}</div>
             {{#if this.reducedDamage}}
                 <i class="fa-solid fa-arrow-right-long"></i>
                 <div class="damage-value">{{this.reducedDamage}}</div>
             {{/if}}
-            {{localize "Damage"}}
+            {{localize "DAGGERHEART.GENERAL.damage"}}
         </button>
     </footer>
 </div>
\ No newline at end of file
diff --git a/templates/dialogs/dice-roll/header.hbs b/templates/dialogs/dice-roll/header.hbs
index b455462c..b2ca18cd 100644
--- a/templates/dialogs/dice-roll/header.hbs
+++ b/templates/dialogs/dice-roll/header.hbs
@@ -16,7 +16,7 @@
     {{#if (and @root.hasRoll @root.activeTagTeamRoll)}}
         <div class="tag-team-controller {{#if @root.tagTeamSelected}}selected{{/if}}" data-action="toggleTagTeamRoll">
             <span><i class="{{ifThen @root.tagTeamSelected "fa-solid" "fa-regular"}} fa-circle"></i></span>
-            <span class="label">{{localize "Tag Team Roll"}}</span>
+            <span class="label">{{localize "DAGGERHEART.APPLICATIONS.TagTeamSelect.title"}}</span>
         </div>
     {{/if}}
 </header>
\ No newline at end of file
diff --git a/templates/dialogs/group-roll/group-roll.hbs b/templates/dialogs/group-roll/group-roll.hbs
index ab655c1f..9b23c0a5 100644
--- a/templates/dialogs/group-roll/group-roll.hbs
+++ b/templates/dialogs/group-roll/group-roll.hbs
@@ -40,7 +40,7 @@
 
     <fieldset class="one-column">
         <legend>{{localize "DAGGERHEART.UI.Chat.groupRoll.partyTeam"}}</legend>
-        <span class="tooltip-container" {{#if allSelected}}data-tooltip="{{localize "The whole party is selected"}}"{{/if}}>
+        <span class="tooltip-container" {{#if allSelected}}data-tooltip="{{localize "DAGGERHEART.UI.Chat.groupRoll.wholePartySelected"}}"{{/if}}>
             <input type="text" class="team-push-input" {{disabled @root.allSelected}}/>
         </span>
         {{#if (gt this.members.length 0)}}
diff --git a/templates/dialogs/rerollDialog/footer.hbs b/templates/dialogs/rerollDialog/footer.hbs
index 4aff2823..5d4ae2b2 100644
--- a/templates/dialogs/rerollDialog/footer.hbs
+++ b/templates/dialogs/rerollDialog/footer.hbs
@@ -1,4 +1,4 @@
 <footer>
-    <button type="button" data-action="doReroll" {{disabled disabledReroll}}>{{localize "Reroll"}} <i class="fa-solid fa-dice"></i></button>
+    <button type="button" data-action="doReroll" {{disabled disabledReroll}}>{{localize "DAGGERHEART.GENERAL.reroll"}} <i class="fa-solid fa-dice"></i></button>
     <button type="button" data-action="save" {{disabled saveDisabled}}>{{localize "DAGGERHEART.APPLICATIONS.RerollDialog.acceptCurrentRolls"}}</button>
 </footer>
\ No newline at end of file
diff --git a/templates/levelup/tabs/footer.hbs b/templates/levelup/tabs/footer.hbs
index 1e87a573..2ee7a316 100644
--- a/templates/levelup/tabs/footer.hbs
+++ b/templates/levelup/tabs/footer.hbs
@@ -3,7 +3,7 @@
         <div class="levelup-navigation-actions {{#if (not this.showTabs)}}test{{/if}}">       
             {{#if this.navigate.previous.fromSummary}}
                 <button data-action="activatePart" data-part="advancements">{{localize "DAGGERHEART.APPLICATIONS.Levelup.navigateToLevelup"}}</button>
-                <button data-action="save" {{#if (not this.levelup.allLevelsFinished)}}disabled{{/if}}>{{localize "Finish Levelup"}}</button>
+                <button data-action="save" {{#if (not this.levelup.allLevelsFinished)}}disabled{{/if}}>{{localize "DAGGERHEART.APPLICATIONS.Levelup.finishLevelup"}}</button>
             {{else}}
                 {{#if (not this.navigate.previous.disabled)}}
                     <button data-action="updateCurrentLevel" >{{this.navigate.previous.label}}</button>
diff --git a/templates/settings/downtime-config/main.hbs b/templates/settings/downtime-config/main.hbs
index 7f681368..5b9c8031 100644
--- a/templates/settings/downtime-config/main.hbs
+++ b/templates/settings/downtime-config/main.hbs
@@ -5,14 +5,14 @@
 >
     {{#if hasIcon}}
         <fieldset class="one-column">
-            <legend>{{localize "Icon"}}</legend>
+            <legend>{{localize "DAGGERHEART.GENERAL.icon"}}</legend>
 
             <input type="text" name="icon" value="{{move.icon}}" />
         </fieldset>
     {{/if}}
 
     <fieldset class="one-column">
-        <legend>{{localize "Description"}}</legend>
+        <legend>{{localize "DAGGERHEART.GENERAL.description"}}</legend>
         
         <prose-mirror name="description" value="{{move.description}}">
             {{{ move.enrichedDescription }}}
diff --git a/templates/sidebar/daggerheart-menu/main.hbs b/templates/sidebar/daggerheart-menu/main.hbs
index a5a86284..4d948409 100644
--- a/templates/sidebar/daggerheart-menu/main.hbs
+++ b/templates/sidebar/daggerheart-menu/main.hbs
@@ -2,7 +2,7 @@
     <h2>{{localize "DAGGERHEART.APPLICATIONS.DaggerheartMenu.title"}}</h2>
     
     <fieldset>
-        <legend>{{localize "Refresh Features"}}</legend>
+        <legend>{{localize "DAGGERHEART.APPLICATIONS.DaggerheartMenu.refreshFeatures"}}</legend>
 
         <div class="menu-refresh-container">
             <div class="menu-refresh-inner-container">
diff --git a/templates/ui/chat/parts/damage-part.hbs b/templates/ui/chat/parts/damage-part.hbs
index 97828bd2..7c72c92c 100644
--- a/templates/ui/chat/parts/damage-part.hbs
+++ b/templates/ui/chat/parts/damage-part.hbs
@@ -33,7 +33,7 @@
                                                     class="dice reroll-button {{../dice}}" 
                                                     data-die-index="0" data-type="damage" data-damage-type="{{@../../../key}}" data-part="{{@../../key}}" data-dice="{{@../key}}" data-result="{{@key}}"
                                                 >
-                                                    {{#if hasRerolls}}<i class="fa-solid fa-dice dice-rerolled" data-tooltip="{{localize "Rerolled"}}"></i>{{/if}}
+                                                    {{#if hasRerolls}}<i class="fa-solid fa-dice dice-rerolled" data-tooltip="{{localize "DAGGERHEART.GENERAL.rerolled"}}"></i>{{/if}}
                                                     {{result}}
                                                 </div>
                                             </div>
diff --git a/templates/ui/tooltip/beastform.hbs b/templates/ui/tooltip/beastform.hbs
index 96a77b9c..0b90c8f7 100644
--- a/templates/ui/tooltip/beastform.hbs
+++ b/templates/ui/tooltip/beastform.hbs
@@ -9,19 +9,19 @@
     <div class="tooltip-information-section spaced">
         {{#with item.system.beastformAttackData}}
             <div class="tooltip-information">
-                <label>{{localize "Main Trait"}}</label>
+                <label>{{localize "DAGGERHEART.ITEMS.Beastform.mainTrait"}}</label>
                 <div>{{this.trait}}</div>
             </div>
             <div class="tooltip-information">
-                <label>{{localize "Trait Bonus"}}</label>
+                <label>{{localize "DAGGERHEART.ITEMS.Beastform.traitBonus"}}</label>
                 <div>{{this.traitBonus}}</div>
             </div>
             <div class="tooltip-information">
-                <label>{{localize "Evasion"}}</label>
+                <label>{{localize "DAGGERHEART.GENERAL.evasion"}}</label>
                 <div>{{this.evasionBonus}}</div>
             </div>
             <div class="tooltip-information">
-                <label>{{localize "Damage"}}</label>
+                <label>{{localize "DAGGERHEART.GENERAL.damage"}}</label>
                 <div>{{concat this.damageDice ' ' this.damageBonus}} <i class="fa-solid fa-hand-fist"></i></div>
             </div>
         {{/with}}