diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b6f4097e..80c01bce 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -17,6 +17,10 @@ We welcome contributions of all kinds:
 
 Please be respectful and collaborative — we’re all here to build something great together.
 
+### Community Translations
+
+Please note that we are not accepting community translations in the main project. Instead, community translations should be published as a module.
+
 ---
 
 ## 🧭 General Guidelines
diff --git a/module/applications/sheets/actors/character.mjs b/module/applications/sheets/actors/character.mjs
index 4f7d947b..c860e9e9 100644
--- a/module/applications/sheets/actors/character.mjs
+++ b/module/applications/sheets/actors/character.mjs
@@ -607,6 +607,15 @@ export default class CharacterSheet extends DHBaseActorSheet {
         const presets = {
             compendium: 'daggerheart',
             folder: key,
+            filter:
+                key === 'subclasses'
+                    ? {
+                          'system.linkedClass.uuid': {
+                              key: 'system.linkedClass.uuid',
+                              value: this.document.system.class.value._stats.compendiumSource
+                          }
+                      }
+                    : undefined,
             render: {
                 noFolder: true
             }
diff --git a/module/data/item/subclass.mjs b/module/data/item/subclass.mjs
index e16a15f7..375588fb 100644
--- a/module/data/item/subclass.mjs
+++ b/module/data/item/subclass.mjs
@@ -52,8 +52,7 @@ export default class DHSubclass extends BaseDataItem {
 
     async _preCreate(data, options, user) {
         if (this.actor?.type === 'character') {
-            const dataUuid =
-                data.uuid ?? (data.folder ? `Compendium.daggerheart.subclasses.Item.${data._id}` : `Item.${data._id}`);
+            const dataUuid = data.uuid ?? data._stats.compendiumSource ?? `Item.${data._id}`;
             if (this.actor.system.class.subclass) {
                 if (this.actor.system.multiclass.subclass) {
                     ui.notifications.warn(game.i18n.localize('DAGGERHEART.UI.Notifications.subclassesAlreadyPresent'));
diff --git a/module/enrichers/DamageEnricher.mjs b/module/enrichers/DamageEnricher.mjs
index a859be9f..a52c4b31 100644
--- a/module/enrichers/DamageEnricher.mjs
+++ b/module/enrichers/DamageEnricher.mjs
@@ -44,7 +44,7 @@ function getDamageMessage(damage, type, inline, defaultElement) {
 
     const dualityElement = document.createElement('span');
     dualityElement.innerHTML = `
-        <button class="enriched-damage-button${inline ? ' inline' : ''}" 
+        <button type="button" class="enriched-damage-button${inline ? ' inline' : ''}" 
             data-value="${damage}"
             data-type="${type}"
             data-tooltip="${game.i18n.localize('DAGGERHEART.GENERAL.damage')}"
@@ -71,6 +71,11 @@ export const renderDamageButton = async event => {
         title: game.i18n.localize('Damage Roll'),
         data: { bonuses: [] },
         source: {},
+        hasDamage: true,
+        hasTarget: true,
+        targets: Array.from(game.user.targets).map(t =>
+            game.system.api.fields.ActionFields.TargetField.formatTarget(t)
+        ),
         roll: [
             {
                 formula: value,
diff --git a/module/enrichers/DualityRollEnricher.mjs b/module/enrichers/DualityRollEnricher.mjs
index ae2c9884..73d4f25a 100644
--- a/module/enrichers/DualityRollEnricher.mjs
+++ b/module/enrichers/DualityRollEnricher.mjs
@@ -36,7 +36,7 @@ function getDualityMessage(roll, flavor) {
 
     const dualityElement = document.createElement('span');
     dualityElement.innerHTML = `
-        <button class="duality-roll-button${roll.inline ? ' inline' : ''}" 
+        <button type="button" class="duality-roll-button${roll.inline ? ' inline' : ''}" 
             data-title="${label}"
             data-label="${dataLabel}"
             data-reaction="${roll.reaction ? 'true' : 'false'}"
diff --git a/module/enrichers/TemplateEnricher.mjs b/module/enrichers/TemplateEnricher.mjs
index 0df3e775..35a3e231 100644
--- a/module/enrichers/TemplateEnricher.mjs
+++ b/module/enrichers/TemplateEnricher.mjs
@@ -34,7 +34,7 @@ export default function DhTemplateEnricher(match, _options) {
 
     const templateElement = document.createElement('span');
     templateElement.innerHTML = `
-        <button class="measured-template-button${inline ? ' inline' : ''}" data-type="${type}" data-range="${range}">
+        <button type="button" class="measured-template-button${inline ? ' inline' : ''}" data-type="${type}" data-range="${range}">
             ${label} - ${game.i18n.localize(`DAGGERHEART.CONFIG.Range.${range}.name`)}
         </button>
     `;
diff --git a/src/packs/classes/loot_Strange_Dirty_Penant_LriTeh9hkwzEaCr1.json b/src/packs/classes/loot_Strange_Dirty_Pendant_LriTeh9hkwzEaCr1.json
similarity index 80%
rename from src/packs/classes/loot_Strange_Dirty_Penant_LriTeh9hkwzEaCr1.json
rename to src/packs/classes/loot_Strange_Dirty_Pendant_LriTeh9hkwzEaCr1.json
index ba307e05..3ca7b938 100644
--- a/src/packs/classes/loot_Strange_Dirty_Penant_LriTeh9hkwzEaCr1.json
+++ b/src/packs/classes/loot_Strange_Dirty_Pendant_LriTeh9hkwzEaCr1.json
@@ -1,6 +1,6 @@
 {
   "folder": "1gQpPaxdgvCxYlLs",
-  "name": "Strange Dirty Penant",
+  "name": "Strange Dirty Pendant",
   "type": "loot",
   "_id": "LriTeh9hkwzEaCr1",
   "img": "icons/equipment/neck/necklace-carved-stone-spiral.webp",
@@ -20,12 +20,12 @@
     "compendiumSource": null,
     "duplicateSource": null,
     "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
     "systemId": "daggerheart",
     "systemVersion": "0.0.1",
     "createdTime": 1754222150005,
-    "modifiedTime": 1754246254311,
-    "lastModifiedBy": "LgnbNMLaxandgMQq"
+    "modifiedTime": 1756136989085,
+    "lastModifiedBy": "HKcDBUU22bYKtQmH"
   },
   "_key": "!items!LriTeh9hkwzEaCr1"
 }
diff --git a/styles/less/ui/settings/homebrew-settings/domains.less b/styles/less/ui/settings/homebrew-settings/domains.less
index e0e0dcd7..893f58be 100644
--- a/styles/less/ui/settings/homebrew-settings/domains.less
+++ b/styles/less/ui/settings/homebrew-settings/domains.less
@@ -54,6 +54,10 @@
             display: grid;
             grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
             gap: 8px;
+            max-height: 184px;
+            overflow: auto;
+            scrollbar-width: thin;
+            scrollbar-color: light-dark(#18162e, #f3c267) transparent;
 
             .domain-container {
                 position: relative;
diff --git a/system.json b/system.json
index 31130bb8..8e5a7610 100644
--- a/system.json
+++ b/system.json
@@ -2,7 +2,7 @@
     "id": "daggerheart",
     "title": "Daggerheart",
     "description": "An unofficial implementation of the Daggerheart system",
-    "version": "1.1.1",
+    "version": "1.1.2",
     "compatibility": {
         "minimum": "13",
         "verified": "13.347",
diff --git a/templates/ui/tooltip/weapon.hbs b/templates/ui/tooltip/weapon.hbs
index bf414e5c..582bfc50 100644
--- a/templates/ui/tooltip/weapon.hbs
+++ b/templates/ui/tooltip/weapon.hbs
@@ -6,7 +6,7 @@
     <div class="tooltip-information-section">
         <div class="tooltip-information">
             <label>{{localize "DAGGERHEART.ITEMS.Weapon.weaponType"}}</label>
-            <div>{{#if item.system.secondaryWeapon}}{{localize "DAGGERHEART.ITEMS.Weapon.secondaryWeapon"}}{{else}}{{localize "DAGGERHEART.ITEMS.Weapon.primaryWeapon"}}{{/if}}</div>
+            <div>{{#if item.system.secondary}}{{localize "DAGGERHEART.ITEMS.Weapon.secondaryWeapon"}}{{else}}{{localize "DAGGERHEART.ITEMS.Weapon.primaryWeapon"}}{{/if}}</div>
         </div>
         <div class="tooltip-information">
             <label>{{localize "DAGGERHEART.GENERAL.burden"}}</label>