diff --git a/.gitignore b/.gitignore
index 61c6b176..264581a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,6 @@
 node_modules
 /packs
 Build
+build
 foundry
-styles/daggerheart.css
\ No newline at end of file
+styles/daggerheart.css
diff --git a/README.md b/README.md
index c40a27a3..fda78b4b 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ This is the community repo for the Foundry VTT system _Foundryborne_ Daggerheart
 
 ## User Install
 
-1. **recommended** Searching for _Daggerheart_ or _Foundryborne_ in the System Instalaltion dialgoe of the FoundryVTT admin settings.
+1. **Recommended** Searching for _Daggerheart_ or _Foundryborne_ in the System Installation dialogue of the FoundryVTT admin settings.
 2. Pasting `https://raw.githubusercontent.com/Foundryborne/daggerheart/refs/heads/main/system.json` into the Install System dialog on the Setup menu of the application.
 3. Downloading one of the .zip archives from the Releases page and extracting it into your foundry Data folder, under Data/systems/daggerheart.
 
diff --git a/assets/logos/FoundrybornBackgroundLogo.png b/assets/logos/FoundrybornBackgroundLogo.png
new file mode 100644
index 00000000..9639b92f
Binary files /dev/null and b/assets/logos/FoundrybornBackgroundLogo.png differ
diff --git a/lang/en.json b/lang/en.json
index 2594d93a..6c5a3d5d 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -823,8 +823,8 @@
                     "name": "Restrained",
                     "description": "When an effect makes a creature Restrained, it means they cannot move until this condition is cleared.\nThey can still take actions from their current position."
                 },
-                "unconcious": {
-                    "name": "Unconcious",
+                "unconscious": {
+                    "name": "Unconscious",
                     "description": "Your character can’t move or act while unconscious, they can’t be targeted by an attack."
                 },
                 "vulnerable": {
@@ -1763,6 +1763,7 @@
                 "weapon": "Range Increase: Weapon"
             },
             "RefreshType": {
+                "scene": "Scene",
                 "session": "Session",
                 "shortrest": "Short Rest",
                 "longrest": "Long Rest"
diff --git a/module/applications/characterCreation/characterCreation.mjs b/module/applications/characterCreation/characterCreation.mjs
index d45fe54e..c160b2fd 100644
--- a/module/applications/characterCreation/characterCreation.mjs
+++ b/module/applications/characterCreation/characterCreation.mjs
@@ -359,6 +359,11 @@ export default class DhCharacterCreation extends HandlebarsApplicationMixin(Appl
                 context.community = { ...this.setup.community, compendium: 'communities' };
                 context.class = { ...this.setup.class, compendium: 'classes' };
                 context.subclass = { ...this.setup.subclass, compendium: 'subclasses' };
+
+                const allDomainData = CONFIG.DH.DOMAIN.allDomains();
+                context.classDomains = context.class.uuid
+                    ? context.class.system.domains.map(key => game.i18n.localize(allDomainData[key].label))
+                    : [];
                 context.domainCards = Object.keys(this.setup.domainCards).reduce((acc, x) => {
                     acc[x] = { ...this.setup.domainCards[x], compendium: 'domains' };
                     return acc;
diff --git a/module/applications/sheets/api/application-mixin.mjs b/module/applications/sheets/api/application-mixin.mjs
index 1a7e19c1..315ae3cb 100644
--- a/module/applications/sheets/api/application-mixin.mjs
+++ b/module/applications/sheets/api/application-mixin.mjs
@@ -419,7 +419,7 @@ export default function DHApplicationMixin(Base) {
                   : this.document.system.actions?.get(actionId);
             if (!doc) return;
 
-            const description = doc.system?.description ?? doc.description;
+            const description = game.i18n.localize(doc.system?.description ?? doc.description);
             const isAction = !!actionId;
             descriptionElement.innerHTML = await foundry.applications.ux.TextEditor.implementation.enrichHTML(
                 description,
diff --git a/module/config/generalConfig.mjs b/module/config/generalConfig.mjs
index 133dd09e..ee0b6671 100644
--- a/module/config/generalConfig.mjs
+++ b/module/config/generalConfig.mjs
@@ -183,11 +183,11 @@ export const conditions = {
         icon: 'icons/magic/control/debuff-chains-shackle-movement-red.webp',
         description: 'DAGGERHEART.CONFIG.Condition.restrained.description'
     },
-    unconcious: {
-        id: 'unconcious',
-        name: 'DAGGERHEART.CONFIG.Condition.unconcious.name',
+    unconscious: {
+        id: 'unconscious',
+        name: 'DAGGERHEART.CONFIG.Condition.unconscious.name',
         icon: 'icons/magic/control/sleep-bubble-purple.webp',
-        description: 'DAGGERHEART.CONFIG.Condition.unconcious.description'
+        description: 'DAGGERHEART.CONFIG.Condition.unconscious.description'
     },
     dead: {
         id: 'dead',
@@ -533,6 +533,10 @@ export const getDiceSoNicePresets = async (hopeFaces, fearFaces, advantageFaces
 };
 
 export const refreshTypes = {
+    scene: {
+        id: 'session',
+        label: 'DAGGERHEART.GENERAL.RefreshType.scene'
+    },
     session: {
         id: 'session',
         label: 'DAGGERHEART.GENERAL.RefreshType.session'
diff --git a/module/config/itemConfig.mjs b/module/config/itemConfig.mjs
index 56f7dfb1..77650298 100644
--- a/module/config/itemConfig.mjs
+++ b/module/config/itemConfig.mjs
@@ -780,7 +780,15 @@ export const weaponFeatures = {
                         mode: 2,
                         value: '1'
                     }
-                ]
+                ],
+                system: {
+                    rangeDependence: {
+                        enabled: true,
+                        range: 'melee',
+                        target: 'hostile',
+                        type: 'withinRange'
+                    }
+                }
             }
         ]
     },
@@ -1079,7 +1087,15 @@ export const weaponFeatures = {
                         mode: 2,
                         value: '2'
                     }
-                ]
+                ],
+                system: {
+                    rangeDependence: {
+                        enabled: true,
+                        range: 'melee',
+                        target: 'hostile',
+                        type: 'withinRange'
+                    }
+                }
             }
         ]
     },
@@ -1208,7 +1224,7 @@ export const weaponFeatures = {
                 img: 'icons/skills/melee/strike-sword-slashing-red.webp',
                 changes: [
                     {
-                        key: 'system.bonuses.roll.primaryWeapon.attack',
+                        key: 'system.bonuses.roll.primaryWeapon.bonus',
                         mode: 2,
                         value: 1
                     }
diff --git a/module/data/action/baseAction.mjs b/module/data/action/baseAction.mjs
index ab515e88..a886bf49 100644
--- a/module/data/action/baseAction.mjs
+++ b/module/data/action/baseAction.mjs
@@ -208,7 +208,14 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
     }
 
     async consume(config, successCost = false) {
-        const usefulResources = foundry.utils.deepClone(this.actor.system.resources);
+        const usefulResources = {
+            ...foundry.utils.deepClone(this.actor.system.resources),
+            fear: {
+                value: game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Resources.Fear),
+                max: game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).maxFear,
+                reversed: false
+            }
+        };
 
         for (var cost of config.costs) {
             if (cost.keyIsID) {
diff --git a/module/data/activeEffect/beastformEffect.mjs b/module/data/activeEffect/beastformEffect.mjs
index e040d8d8..b5cbdb28 100644
--- a/module/data/activeEffect/beastformEffect.mjs
+++ b/module/data/activeEffect/beastformEffect.mjs
@@ -32,7 +32,7 @@ export default class BeastformEffect extends BaseEffect {
 
         if (this.parent.parent?.type === 'character') {
             this.parent.parent.system.primaryWeapon?.update?.({ 'system.equipped': false });
-            this.parent.parent.system.secondayWeapon?.update?.({ 'system.equipped': false });
+            this.parent.parent.system.secondaryWeapon?.update?.({ 'system.equipped': false });
         }
     }
 
diff --git a/module/data/item/armor.mjs b/module/data/item/armor.mjs
index 01e1d186..a8c3dcec 100644
--- a/module/data/item/armor.mjs
+++ b/module/data/item/armor.mjs
@@ -60,7 +60,7 @@ export default class DHArmor extends AttachableItem {
         const allowed = await super._preUpdate(changes, options, user);
         if (allowed === false) return false;
 
-        if (changes.system.armorFeatures) {
+        if (changes.system?.armorFeatures) {
             const removed = this.armorFeatures.filter(x => !changes.system.armorFeatures.includes(x));
             const added = changes.system.armorFeatures.filter(x => !this.armorFeatures.includes(x));
 
diff --git a/module/data/item/class.mjs b/module/data/item/class.mjs
index 45e8b4ab..cee17613 100644
--- a/module/data/item/class.mjs
+++ b/module/data/item/class.mjs
@@ -60,6 +60,17 @@ export default class DHClass extends BaseDataItem {
 
     /* -------------------------------------------- */
 
+    get domainData() {
+        const allDomainData = CONFIG.DH.DOMAIN.allDomains();
+        return this.domains.map(key => {
+            const domain = allDomainData[key];
+            return {
+                ...domain,
+                label: game.i18n.localize(domain.label)
+            };
+        });
+    }
+
     get hopeFeatures() {
         return this.features.filter(x => x.type === CONFIG.DH.ITEM.featureSubTypes.hope).map(x => x.item);
     }
diff --git a/module/data/item/domainCard.mjs b/module/data/item/domainCard.mjs
index 34754a41..7705adb1 100644
--- a/module/data/item/domainCard.mjs
+++ b/module/data/item/domainCard.mjs
@@ -33,6 +33,11 @@ export default class DHDomainCard extends BaseDataItem {
         };
     }
 
+    get domainLabel() {
+        const allDomainData = CONFIG.DH.DOMAIN.allDomains();
+        return game.i18n.localize(allDomainData[this.domain].label);
+    }
+
     /* -------------------------------------------- */
 
     /**@override */
@@ -71,7 +76,7 @@ export default class DHDomainCard extends BaseDataItem {
     _getTags() {
         const tags = [
             game.i18n.localize(`DAGGERHEART.CONFIG.DomainCardTypes.${this.type}`),
-            game.i18n.localize(`DAGGERHEART.GENERAL.Domain.${this.domain}.label`),
+            this.domainLabel,
             `${game.i18n.localize('DAGGERHEART.ITEMS.DomainCard.recallCost')}: ${this.recallCost}`
         ];
 
@@ -85,7 +90,7 @@ export default class DHDomainCard extends BaseDataItem {
     _getLabels() {
         const labels = [
             game.i18n.localize(`DAGGERHEART.CONFIG.DomainCardTypes.${this.type}`),
-            game.i18n.localize(`DAGGERHEART.GENERAL.Domain.${this.domain}.label`),
+            this.domainLabel,
             {
                 value: `${this.recallCost}`, //converts the number to a string
                 icons: ['fa-bolt']
diff --git a/module/dice/damageRoll.mjs b/module/dice/damageRoll.mjs
index 44794faa..8a72d86e 100644
--- a/module/dice/damageRoll.mjs
+++ b/module/dice/damageRoll.mjs
@@ -159,25 +159,28 @@ export default class DamageRoll extends DHRoll {
         if (config.data?.parent) {
             if (config.data.parent.appliedEffects) {
                 // Bardic Rally
-                mods.rally = {
-                    label: 'DAGGERHEART.CLASS.Feature.rallyDice',
-                    values: config.data?.parent?.appliedEffects.reduce((a, c) => {
+                const rallyChoices = config.data?.parent?.appliedEffects.reduce((a, c) => {
                         const change = c.changes.find(ch => ch.key === 'system.bonuses.rally');
                         if (change) a.push({ value: c.id, label: change.value });
                         return a;
-                    }, []),
-                    value: null,
-                    beforeCrit: true,
-                    callback: part => {
-                        const rallyFaces = config.modifiers.rally.values.find(
-                            r => r.value === config.modifiers.rally.value
-                        )?.label;
-                        part.roll.terms.push(
-                            new foundry.dice.terms.OperatorTerm({ operator: '+' }),
-                            ...this.parse(`1${rallyFaces}`)
-                        );
-                    }
-                };
+                    }, [])
+                if(rallyChoices.length) {
+                    mods.rally = {
+                        label: 'DAGGERHEART.CLASS.Feature.rallyDice',
+                        values: rallyChoices,
+                        value: null,
+                        beforeCrit: true,
+                        callback: part => {
+                            const rallyFaces = config.modifiers.rally.values.find(
+                                r => r.value === config.modifiers.rally.value
+                            )?.label;
+                            part.roll.terms.push(
+                                new foundry.dice.terms.OperatorTerm({ operator: '+' }),
+                                ...this.parse(`1${rallyFaces}`)
+                            );
+                        }
+                    };
+                }
             }
 
             const item = config.data.parent.items?.get(config.source.item);
diff --git a/module/dice/dhRoll.mjs b/module/dice/dhRoll.mjs
index 504a9c02..126a7944 100644
--- a/module/dice/dhRoll.mjs
+++ b/module/dice/dhRoll.mjs
@@ -238,7 +238,7 @@ export const registerRollDiceHooks = () => {
 
         if (updates.length) {
             const target = actor.system.partner ?? actor;
-            if (!['dead', 'unconcious'].some(x => actor.statuses.has(x))) {
+            if (!['dead', 'unconscious'].some(x => actor.statuses.has(x))) {
                 setTimeout(() => {
                     target.modifyResource(updates);
                 }, 50);
diff --git a/module/documents/chatMessage.mjs b/module/documents/chatMessage.mjs
index 3ade8c4a..2b10e251 100644
--- a/module/documents/chatMessage.mjs
+++ b/module/documents/chatMessage.mjs
@@ -69,6 +69,11 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
                     break;
             }
         }
+        
+        if(!game.user.isGM && !this.isAuthor && !this.speakerActor?.isOwner) {
+            const buttons = html.querySelectorAll(".ability-card-footer > .ability-use-button");
+            buttons.forEach(b => b.remove());
+        }
     }
 
     addChatListeners(html) {
diff --git a/module/helpers/handlebarsHelper.mjs b/module/helpers/handlebarsHelper.mjs
index deb62659..171255e2 100644
--- a/module/helpers/handlebarsHelper.mjs
+++ b/module/helpers/handlebarsHelper.mjs
@@ -60,7 +60,7 @@ export default class RegisterHandlebarsHelpers {
 
     static rollParsed(value, actor, item, numerical) {
         const isNumerical = typeof numerical === 'boolean' ? numerical : false;
-        const result = itemAbleRollParse(value, actor.getRollData(), item);
+        const result = itemAbleRollParse(value, actor?.getRollData() ?? {}, item);
         return isNumerical ? (!result ? 0 : Number(result)) : result;
     }
 
@@ -69,7 +69,7 @@ export default class RegisterHandlebarsHelpers {
     }
 
     static empty(object) {
-        if(!(typeof object === 'object')) return true;
+        if (!(typeof object === 'object')) return true;
         return Object.keys(object).length === 0;
     }
 }
diff --git a/module/helpers/utils.mjs b/module/helpers/utils.mjs
index 6124cfbe..3dc1f7ed 100644
--- a/module/helpers/utils.mjs
+++ b/module/helpers/utils.mjs
@@ -85,7 +85,13 @@ export const chunkify = (array, chunkSize, mappingFunc) => {
 
 export const tagifyElement = (element, baseOptions, onChange, tagifyOptions = {}) => {
     const { maxTags } = tagifyOptions;
-    const options = typeof baseOptions === 'object' ? Object.values(baseOptions) : baseOptions;
+    const options =
+        typeof baseOptions === 'object'
+            ? Object.keys(baseOptions).map(optionKey => ({
+                  ...baseOptions[optionKey],
+                  id: optionKey
+              }))
+            : baseOptions;
 
     const tagifyElement = new Tagify(element, {
         tagTextProp: 'name',
diff --git a/src/packs/classes/feature_Sneak_Attack_5QqpEwmwkPfZHpMW.json b/src/packs/classes/feature_Sneak_Attack_5QqpEwmwkPfZHpMW.json
index a0e98763..ec203e9a 100644
--- a/src/packs/classes/feature_Sneak_Attack_5QqpEwmwkPfZHpMW.json
+++ b/src/packs/classes/feature_Sneak_Attack_5QqpEwmwkPfZHpMW.json
@@ -59,13 +59,13 @@
         {
           "key": "system.bonuses.damage.physical.dice",
           "mode": 2,
-          "value": "@system.tierd6",
+          "value": "@tierd6",
           "priority": null
         },
         {
           "key": "system.bonuses.damage.magical.dice",
           "mode": 2,
-          "value": "@system.tierd6",
+          "value": "@tierd6",
           "priority": null
         }
       ],
diff --git a/src/packs/items/weapons/weapon_Aantari_Bow_ijodu5yNBoMxpkHV.json b/src/packs/items/weapons/weapon_Aantari_Bow_ijodu5yNBoMxpkHV.json
index 16c4b359..0dc1f068 100644
--- a/src/packs/items/weapons/weapon_Aantari_Bow_ijodu5yNBoMxpkHV.json
+++ b/src/packs/items/weapons/weapon_Aantari_Bow_ijodu5yNBoMxpkHV.json
@@ -16,7 +16,7 @@
       {
         "value": "reliable",
         "effectIds": [
-          "HrbJ0bI7lMAYUCux"
+          "nRNnU57i7RMJoklC"
         ],
         "actionIds": []
       }
@@ -109,14 +109,21 @@
       "img": "icons/skills/melee/strike-sword-slashing-red.webp",
       "changes": [
         {
-          "key": "system.bonuses.roll.primaryWeapon.attack",
+          "key": "system.bonuses.roll.primaryWeapon.bonus",
           "mode": 2,
           "value": "1"
         }
       ],
-      "_id": "HrbJ0bI7lMAYUCux",
+      "_id": "nRNnU57i7RMJoklC",
       "type": "base",
-      "system": {},
+      "system": {
+        "rangeDependence": {
+          "enabled": false,
+          "type": "withinRange",
+          "target": "hostile",
+          "range": "melee"
+        }
+      },
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -132,14 +139,14 @@
         "compendiumSource": null,
         "duplicateSource": null,
         "exportSource": null,
-        "coreVersion": "13.346",
+        "coreVersion": "13.347",
         "systemId": "daggerheart",
-        "systemVersion": "0.0.1",
-        "createdTime": 1753835307838,
-        "modifiedTime": 1753835307838,
-        "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+        "systemVersion": "1.0.0",
+        "createdTime": 1754815224718,
+        "modifiedTime": 1754815224718,
+        "lastModifiedBy": "MQSznptE5yLT7kj8"
       },
-      "_key": "!items.effects!ijodu5yNBoMxpkHV.HrbJ0bI7lMAYUCux"
+      "_key": "!items.effects!ijodu5yNBoMxpkHV.nRNnU57i7RMJoklC"
     }
   ],
   "sort": 0,
@@ -152,12 +159,12 @@
     "compendiumSource": null,
     "duplicateSource": null,
     "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
     "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.0.0",
     "createdTime": 1753835285790,
-    "modifiedTime": 1753835317605,
-    "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+    "modifiedTime": 1754815224721,
+    "lastModifiedBy": "MQSznptE5yLT7kj8"
   },
   "_key": "!items!ijodu5yNBoMxpkHV"
 }
diff --git a/src/packs/items/weapons/weapon_Advanced_Arcane_Frame_Wheelchair_la3sAWgnvadc4NvP.json b/src/packs/items/weapons/weapon_Advanced_Arcane_Frame_Wheelchair_la3sAWgnvadc4NvP.json
index f0796325..c5edd49f 100644
--- a/src/packs/items/weapons/weapon_Advanced_Arcane_Frame_Wheelchair_la3sAWgnvadc4NvP.json
+++ b/src/packs/items/weapons/weapon_Advanced_Arcane_Frame_Wheelchair_la3sAWgnvadc4NvP.json
@@ -15,7 +15,7 @@
       {
         "value": "reliable",
         "effectIds": [
-          "G561ymlNGmaFAYFB"
+          "VnV5X9MBMabhz47b"
         ],
         "actionIds": []
       }
@@ -108,14 +108,21 @@
       "img": "icons/skills/melee/strike-sword-slashing-red.webp",
       "changes": [
         {
-          "key": "system.bonuses.roll.primaryWeapon.attack",
+          "key": "system.bonuses.roll.primaryWeapon.bonus",
           "mode": 2,
           "value": "1"
         }
       ],
-      "_id": "G561ymlNGmaFAYFB",
+      "_id": "VnV5X9MBMabhz47b",
       "type": "base",
-      "system": {},
+      "system": {
+        "rangeDependence": {
+          "enabled": false,
+          "type": "withinRange",
+          "target": "hostile",
+          "range": "melee"
+        }
+      },
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -131,12 +138,14 @@
         "compendiumSource": null,
         "duplicateSource": null,
         "exportSource": null,
-        "coreVersion": "13.346",
+        "coreVersion": "13.347",
         "systemId": "daggerheart",
-        "systemVersion": "0.0.1",
-        "lastModifiedBy": null
+        "systemVersion": "1.0.0",
+        "createdTime": 1754815300372,
+        "modifiedTime": 1754815300372,
+        "lastModifiedBy": "MQSznptE5yLT7kj8"
       },
-      "_key": "!items.effects!la3sAWgnvadc4NvP.G561ymlNGmaFAYFB"
+      "_key": "!items.effects!la3sAWgnvadc4NvP.VnV5X9MBMabhz47b"
     }
   ],
   "ownership": {
@@ -148,12 +157,12 @@
     "compendiumSource": null,
     "duplicateSource": null,
     "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
     "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.0.0",
     "createdTime": 1753836715885,
-    "modifiedTime": 1753836789197,
-    "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+    "modifiedTime": 1754815300375,
+    "lastModifiedBy": "MQSznptE5yLT7kj8"
   },
   "_id": "la3sAWgnvadc4NvP",
   "sort": 0,
diff --git a/src/packs/items/weapons/weapon_Advanced_Broadsword_WtQAGz0TUgz8Xg70.json b/src/packs/items/weapons/weapon_Advanced_Broadsword_WtQAGz0TUgz8Xg70.json
index ad5ad7ae..19a6d9bf 100644
--- a/src/packs/items/weapons/weapon_Advanced_Broadsword_WtQAGz0TUgz8Xg70.json
+++ b/src/packs/items/weapons/weapon_Advanced_Broadsword_WtQAGz0TUgz8Xg70.json
@@ -16,7 +16,7 @@
       {
         "value": "reliable",
         "effectIds": [
-          "fRPKHzbKRz4yTHAF"
+          "wu2AmDvgeWI3hmRQ"
         ],
         "actionIds": []
       }
@@ -109,14 +109,21 @@
       "img": "icons/skills/melee/strike-sword-slashing-red.webp",
       "changes": [
         {
-          "key": "system.bonuses.roll.primaryWeapon.attack",
+          "key": "system.bonuses.roll.primaryWeapon.bonus",
           "mode": 2,
           "value": "1"
         }
       ],
-      "_id": "fRPKHzbKRz4yTHAF",
+      "_id": "wu2AmDvgeWI3hmRQ",
       "type": "base",
-      "system": {},
+      "system": {
+        "rangeDependence": {
+          "enabled": false,
+          "type": "withinRange",
+          "target": "hostile",
+          "range": "melee"
+        }
+      },
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -132,14 +139,14 @@
         "compendiumSource": null,
         "duplicateSource": null,
         "exportSource": null,
-        "coreVersion": "13.346",
+        "coreVersion": "13.347",
         "systemId": "daggerheart",
-        "systemVersion": "0.0.1",
-        "createdTime": 1753831629563,
-        "modifiedTime": 1753831629563,
-        "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+        "systemVersion": "1.0.0",
+        "createdTime": 1754814950116,
+        "modifiedTime": 1754814950116,
+        "lastModifiedBy": "MQSznptE5yLT7kj8"
       },
-      "_key": "!items.effects!WtQAGz0TUgz8Xg70.fRPKHzbKRz4yTHAF"
+      "_key": "!items.effects!WtQAGz0TUgz8Xg70.wu2AmDvgeWI3hmRQ"
     }
   ],
   "sort": 0,
@@ -152,12 +159,12 @@
     "compendiumSource": null,
     "duplicateSource": null,
     "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
     "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.0.0",
     "createdTime": 1753831599435,
-    "modifiedTime": 1753831629573,
-    "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+    "modifiedTime": 1754814950120,
+    "lastModifiedBy": "MQSznptE5yLT7kj8"
   },
   "_key": "!items!WtQAGz0TUgz8Xg70"
 }
diff --git a/src/packs/items/weapons/weapon_Advanced_Small_Dagger_0thN0BpN05KT8Avx.json b/src/packs/items/weapons/weapon_Advanced_Small_Dagger_0thN0BpN05KT8Avx.json
index cf3ae063..bfcef598 100644
--- a/src/packs/items/weapons/weapon_Advanced_Small_Dagger_0thN0BpN05KT8Avx.json
+++ b/src/packs/items/weapons/weapon_Advanced_Small_Dagger_0thN0BpN05KT8Avx.json
@@ -16,7 +16,7 @@
       {
         "value": "paired",
         "effectIds": [
-          "gJ7Ey9CfPZqYgxEO"
+          "MYgB3v3oQ5lIr3VE"
         ],
         "actionIds": []
       }
@@ -114,9 +114,16 @@
           "value": "ITEM.@system.tier + 1"
         }
       ],
-      "_id": "gJ7Ey9CfPZqYgxEO",
+      "system": {
+        "rangeDependence": {
+          "enabled": true,
+          "range": "melee",
+          "target": "hostile",
+          "type": "withinRange"
+        }
+      },
+      "_id": "MYgB3v3oQ5lIr3VE",
       "type": "base",
-      "system": {},
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -132,14 +139,14 @@
         "compendiumSource": null,
         "duplicateSource": null,
         "exportSource": null,
-        "coreVersion": "13.346",
+        "coreVersion": "13.347",
         "systemId": "daggerheart",
-        "systemVersion": "0.0.1",
-        "createdTime": 1753794991410,
-        "modifiedTime": 1753794991410,
-        "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+        "systemVersion": "1.0.0",
+        "createdTime": 1754814673988,
+        "modifiedTime": 1754814673988,
+        "lastModifiedBy": "MQSznptE5yLT7kj8"
       },
-      "_key": "!items.effects!0thN0BpN05KT8Avx.gJ7Ey9CfPZqYgxEO"
+      "_key": "!items.effects!0thN0BpN05KT8Avx.MYgB3v3oQ5lIr3VE"
     }
   ],
   "sort": 0,
@@ -152,12 +159,12 @@
     "compendiumSource": null,
     "duplicateSource": null,
     "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
     "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.0.0",
     "createdTime": 1753794938643,
-    "modifiedTime": 1753794991413,
-    "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+    "modifiedTime": 1754814673991,
+    "lastModifiedBy": "MQSznptE5yLT7kj8"
   },
   "_key": "!items!0thN0BpN05KT8Avx"
 }
diff --git a/src/packs/items/weapons/weapon_Arcane_Frame_Wheelchair_XRChepscgr75Uug7.json b/src/packs/items/weapons/weapon_Arcane_Frame_Wheelchair_XRChepscgr75Uug7.json
index 6d18e14c..49e052b7 100644
--- a/src/packs/items/weapons/weapon_Arcane_Frame_Wheelchair_XRChepscgr75Uug7.json
+++ b/src/packs/items/weapons/weapon_Arcane_Frame_Wheelchair_XRChepscgr75Uug7.json
@@ -16,7 +16,7 @@
       {
         "value": "reliable",
         "effectIds": [
-          "G561ymlNGmaFAYFB"
+          "dXHsy9qr5FWZqsVq"
         ],
         "actionIds": []
       }
@@ -109,14 +109,21 @@
       "img": "icons/skills/melee/strike-sword-slashing-red.webp",
       "changes": [
         {
-          "key": "system.bonuses.roll.primaryWeapon.attack",
+          "key": "system.bonuses.roll.primaryWeapon.bonus",
           "mode": 2,
           "value": "1"
         }
       ],
-      "_id": "G561ymlNGmaFAYFB",
+      "_id": "dXHsy9qr5FWZqsVq",
       "type": "base",
-      "system": {},
+      "system": {
+        "rangeDependence": {
+          "enabled": false,
+          "type": "withinRange",
+          "target": "hostile",
+          "range": "melee"
+        }
+      },
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -132,14 +139,14 @@
         "compendiumSource": null,
         "duplicateSource": null,
         "exportSource": null,
-        "coreVersion": "13.346",
+        "coreVersion": "13.347",
         "systemId": "daggerheart",
-        "systemVersion": "0.0.1",
-        "createdTime": 1753836707582,
-        "modifiedTime": 1753836707582,
-        "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+        "systemVersion": "1.0.0",
+        "createdTime": 1754815278217,
+        "modifiedTime": 1754815278217,
+        "lastModifiedBy": "MQSznptE5yLT7kj8"
       },
-      "_key": "!items.effects!XRChepscgr75Uug7.G561ymlNGmaFAYFB"
+      "_key": "!items.effects!XRChepscgr75Uug7.dXHsy9qr5FWZqsVq"
     }
   ],
   "sort": 0,
@@ -152,12 +159,12 @@
     "compendiumSource": null,
     "duplicateSource": null,
     "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
     "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.0.0",
     "createdTime": 1753836689082,
-    "modifiedTime": 1753836707594,
-    "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+    "modifiedTime": 1754815278220,
+    "lastModifiedBy": "MQSznptE5yLT7kj8"
   },
   "_key": "!items!XRChepscgr75Uug7"
 }
diff --git a/src/packs/items/weapons/weapon_Broadsword_1cwWNt4sqlgA8gCT.json b/src/packs/items/weapons/weapon_Broadsword_1cwWNt4sqlgA8gCT.json
index 1934036f..959a8547 100644
--- a/src/packs/items/weapons/weapon_Broadsword_1cwWNt4sqlgA8gCT.json
+++ b/src/packs/items/weapons/weapon_Broadsword_1cwWNt4sqlgA8gCT.json
@@ -16,7 +16,7 @@
       {
         "value": "reliable",
         "effectIds": [
-          "GNwIa1EAaa0T0RZi"
+          "mqcpj2cFAprf2AmY"
         ],
         "actionIds": []
       }
@@ -109,14 +109,21 @@
       "img": "icons/skills/melee/strike-sword-slashing-red.webp",
       "changes": [
         {
-          "key": "system.bonuses.roll.primaryWeapon.attack",
+          "key": "system.bonuses.roll.primaryWeapon.bonus",
           "mode": 2,
           "value": "1"
         }
       ],
-      "_id": "GNwIa1EAaa0T0RZi",
+      "_id": "mqcpj2cFAprf2AmY",
       "type": "base",
-      "system": {},
+      "system": {
+        "rangeDependence": {
+          "enabled": false,
+          "type": "withinRange",
+          "target": "hostile",
+          "range": "melee"
+        }
+      },
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -132,14 +139,14 @@
         "compendiumSource": null,
         "duplicateSource": null,
         "exportSource": null,
-        "coreVersion": "13.346",
+        "coreVersion": "13.347",
         "systemId": "daggerheart",
-        "systemVersion": "0.0.1",
-        "createdTime": 1753827762112,
-        "modifiedTime": 1753827762112,
-        "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+        "systemVersion": "1.0.0",
+        "createdTime": 1754814769818,
+        "modifiedTime": 1754814769818,
+        "lastModifiedBy": "MQSznptE5yLT7kj8"
       },
-      "_key": "!items.effects!1cwWNt4sqlgA8gCT.GNwIa1EAaa0T0RZi"
+      "_key": "!items.effects!1cwWNt4sqlgA8gCT.mqcpj2cFAprf2AmY"
     }
   ],
   "sort": 0,
@@ -152,12 +159,12 @@
     "compendiumSource": null,
     "duplicateSource": null,
     "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
     "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.0.0",
     "createdTime": 1753827734892,
-    "modifiedTime": 1753827762118,
-    "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+    "modifiedTime": 1754814769821,
+    "lastModifiedBy": "MQSznptE5yLT7kj8"
   },
   "_key": "!items!1cwWNt4sqlgA8gCT"
 }
diff --git a/src/packs/items/weapons/weapon_Improved_Arcane_Frame_Wheelchair_N9P695V5KKlJbAY5.json b/src/packs/items/weapons/weapon_Improved_Arcane_Frame_Wheelchair_N9P695V5KKlJbAY5.json
index 36070ae1..e28a9c44 100644
--- a/src/packs/items/weapons/weapon_Improved_Arcane_Frame_Wheelchair_N9P695V5KKlJbAY5.json
+++ b/src/packs/items/weapons/weapon_Improved_Arcane_Frame_Wheelchair_N9P695V5KKlJbAY5.json
@@ -15,7 +15,7 @@
       {
         "value": "reliable",
         "effectIds": [
-          "G561ymlNGmaFAYFB"
+          "1f6fFhOLwZrmA6e5"
         ],
         "actionIds": []
       }
@@ -108,14 +108,21 @@
       "img": "icons/skills/melee/strike-sword-slashing-red.webp",
       "changes": [
         {
-          "key": "system.bonuses.roll.primaryWeapon.attack",
+          "key": "system.bonuses.roll.primaryWeapon.bonus",
           "mode": 2,
           "value": "1"
         }
       ],
-      "_id": "G561ymlNGmaFAYFB",
+      "_id": "1f6fFhOLwZrmA6e5",
       "type": "base",
-      "system": {},
+      "system": {
+        "rangeDependence": {
+          "enabled": false,
+          "type": "withinRange",
+          "target": "hostile",
+          "range": "melee"
+        }
+      },
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -131,12 +138,14 @@
         "compendiumSource": null,
         "duplicateSource": null,
         "exportSource": null,
-        "coreVersion": "13.346",
+        "coreVersion": "13.347",
         "systemId": "daggerheart",
-        "systemVersion": "0.0.1",
-        "lastModifiedBy": null
+        "systemVersion": "1.0.0",
+        "createdTime": 1754815290648,
+        "modifiedTime": 1754815290648,
+        "lastModifiedBy": "MQSznptE5yLT7kj8"
       },
-      "_key": "!items.effects!N9P695V5KKlJbAY5.G561ymlNGmaFAYFB"
+      "_key": "!items.effects!N9P695V5KKlJbAY5.1f6fFhOLwZrmA6e5"
     }
   ],
   "ownership": {
@@ -148,12 +157,12 @@
     "compendiumSource": null,
     "duplicateSource": null,
     "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
     "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.0.0",
     "createdTime": 1753836714712,
-    "modifiedTime": 1753836748404,
-    "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+    "modifiedTime": 1754815290653,
+    "lastModifiedBy": "MQSznptE5yLT7kj8"
   },
   "_id": "N9P695V5KKlJbAY5",
   "sort": 0,
diff --git a/src/packs/items/weapons/weapon_Improved_Broadsword_OcKeLJxvmdT81VBc.json b/src/packs/items/weapons/weapon_Improved_Broadsword_OcKeLJxvmdT81VBc.json
index dad2f4db..69e46858 100644
--- a/src/packs/items/weapons/weapon_Improved_Broadsword_OcKeLJxvmdT81VBc.json
+++ b/src/packs/items/weapons/weapon_Improved_Broadsword_OcKeLJxvmdT81VBc.json
@@ -16,7 +16,7 @@
       {
         "value": "reliable",
         "effectIds": [
-          "xU0DD5ydbwmXMKtF"
+          "228lcQpohdJ3Bbga"
         ],
         "actionIds": []
       }
@@ -109,14 +109,21 @@
       "img": "icons/skills/melee/strike-sword-slashing-red.webp",
       "changes": [
         {
-          "key": "system.bonuses.roll.primaryWeapon.attack",
+          "key": "system.bonuses.roll.primaryWeapon.bonus",
           "mode": 2,
           "value": "1"
         }
       ],
-      "_id": "xU0DD5ydbwmXMKtF",
+      "_id": "228lcQpohdJ3Bbga",
       "type": "base",
-      "system": {},
+      "system": {
+        "rangeDependence": {
+          "enabled": false,
+          "type": "withinRange",
+          "target": "hostile",
+          "range": "melee"
+        }
+      },
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -132,14 +139,14 @@
         "compendiumSource": null,
         "duplicateSource": null,
         "exportSource": null,
-        "coreVersion": "13.346",
+        "coreVersion": "13.347",
         "systemId": "daggerheart",
-        "systemVersion": "0.0.1",
-        "createdTime": 1753829126416,
-        "modifiedTime": 1753829126416,
-        "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+        "systemVersion": "1.0.0",
+        "createdTime": 1754814935810,
+        "modifiedTime": 1754814935810,
+        "lastModifiedBy": "MQSznptE5yLT7kj8"
       },
-      "_key": "!items.effects!OcKeLJxvmdT81VBc.xU0DD5ydbwmXMKtF"
+      "_key": "!items.effects!OcKeLJxvmdT81VBc.228lcQpohdJ3Bbga"
     }
   ],
   "sort": 0,
@@ -152,12 +159,12 @@
     "compendiumSource": null,
     "duplicateSource": null,
     "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
     "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.0.0",
     "createdTime": 1753829098118,
-    "modifiedTime": 1753829367508,
-    "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+    "modifiedTime": 1754814935815,
+    "lastModifiedBy": "MQSznptE5yLT7kj8"
   },
   "_key": "!items!OcKeLJxvmdT81VBc"
 }
diff --git a/src/packs/items/weapons/weapon_Improved_Shortsword_rSyBNRwemBVuTo3H.json b/src/packs/items/weapons/weapon_Improved_Shortsword_rSyBNRwemBVuTo3H.json
index 65f03b0b..fb585281 100644
--- a/src/packs/items/weapons/weapon_Improved_Shortsword_rSyBNRwemBVuTo3H.json
+++ b/src/packs/items/weapons/weapon_Improved_Shortsword_rSyBNRwemBVuTo3H.json
@@ -16,7 +16,7 @@
       {
         "value": "paired",
         "effectIds": [
-          "cSmiIOXeuw0xpjel"
+          "9iHHwd9BxkBsV9lY"
         ],
         "actionIds": []
       }
@@ -114,9 +114,16 @@
           "value": "ITEM.@system.tier + 1"
         }
       ],
-      "_id": "cSmiIOXeuw0xpjel",
+      "system": {
+        "rangeDependence": {
+          "enabled": true,
+          "range": "melee",
+          "target": "hostile",
+          "type": "withinRange"
+        }
+      },
+      "_id": "9iHHwd9BxkBsV9lY",
       "type": "base",
-      "system": {},
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -132,14 +139,14 @@
         "compendiumSource": null,
         "duplicateSource": null,
         "exportSource": null,
-        "coreVersion": "13.346",
+        "coreVersion": "13.347",
         "systemId": "daggerheart",
-        "systemVersion": "0.0.1",
-        "createdTime": 1753794021004,
-        "modifiedTime": 1753794021004,
-        "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+        "systemVersion": "1.0.0",
+        "createdTime": 1754814695260,
+        "modifiedTime": 1754814695260,
+        "lastModifiedBy": "MQSznptE5yLT7kj8"
       },
-      "_key": "!items.effects!rSyBNRwemBVuTo3H.cSmiIOXeuw0xpjel"
+      "_key": "!items.effects!rSyBNRwemBVuTo3H.9iHHwd9BxkBsV9lY"
     }
   ],
   "sort": 0,
@@ -152,12 +159,12 @@
     "compendiumSource": null,
     "duplicateSource": null,
     "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
     "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.0.0",
     "createdTime": 1753744566951,
-    "modifiedTime": 1753794021010,
-    "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+    "modifiedTime": 1754814695265,
+    "lastModifiedBy": "MQSznptE5yLT7kj8"
   },
   "_key": "!items!rSyBNRwemBVuTo3H"
 }
diff --git a/src/packs/items/weapons/weapon_Improved_Small_Dagger_nMuF8ZDZ2aXZVTg6.json b/src/packs/items/weapons/weapon_Improved_Small_Dagger_nMuF8ZDZ2aXZVTg6.json
index 04379b71..e141fbc2 100644
--- a/src/packs/items/weapons/weapon_Improved_Small_Dagger_nMuF8ZDZ2aXZVTg6.json
+++ b/src/packs/items/weapons/weapon_Improved_Small_Dagger_nMuF8ZDZ2aXZVTg6.json
@@ -16,7 +16,7 @@
       {
         "value": "paired",
         "effectIds": [
-          "rOjtLkrnI9EZHJm8"
+          "JHIUGyZH5q83ODvd"
         ],
         "actionIds": []
       }
@@ -114,9 +114,16 @@
           "value": "ITEM.@system.tier + 1"
         }
       ],
-      "_id": "rOjtLkrnI9EZHJm8",
+      "system": {
+        "rangeDependence": {
+          "enabled": true,
+          "range": "melee",
+          "target": "hostile",
+          "type": "withinRange"
+        }
+      },
+      "_id": "JHIUGyZH5q83ODvd",
       "type": "base",
-      "system": {},
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -132,14 +139,14 @@
         "compendiumSource": null,
         "duplicateSource": null,
         "exportSource": null,
-        "coreVersion": "13.346",
+        "coreVersion": "13.347",
         "systemId": "daggerheart",
-        "systemVersion": "0.0.1",
-        "createdTime": 1753794340876,
-        "modifiedTime": 1753794340876,
-        "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+        "systemVersion": "1.0.0",
+        "createdTime": 1754814703717,
+        "modifiedTime": 1754814703717,
+        "lastModifiedBy": "MQSznptE5yLT7kj8"
       },
-      "_key": "!items.effects!nMuF8ZDZ2aXZVTg6.rOjtLkrnI9EZHJm8"
+      "_key": "!items.effects!nMuF8ZDZ2aXZVTg6.JHIUGyZH5q83ODvd"
     }
   ],
   "sort": 0,
@@ -152,12 +159,12 @@
     "compendiumSource": null,
     "duplicateSource": null,
     "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
     "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.0.0",
     "createdTime": 1753794291887,
-    "modifiedTime": 1753794340879,
-    "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+    "modifiedTime": 1754814703719,
+    "lastModifiedBy": "MQSznptE5yLT7kj8"
   },
   "_key": "!items!nMuF8ZDZ2aXZVTg6"
 }
diff --git a/src/packs/items/weapons/weapon_Keeper_s_Staff_q382JqMkqLaaFLIr.json b/src/packs/items/weapons/weapon_Keeper_s_Staff_q382JqMkqLaaFLIr.json
index c7b5c32f..d934731d 100644
--- a/src/packs/items/weapons/weapon_Keeper_s_Staff_q382JqMkqLaaFLIr.json
+++ b/src/packs/items/weapons/weapon_Keeper_s_Staff_q382JqMkqLaaFLIr.json
@@ -16,7 +16,7 @@
       {
         "value": "reliable",
         "effectIds": [
-          "FlmOrbhYbieIAVJL"
+          "LvxPAfrKuRfgubGV"
         ],
         "actionIds": []
       }
@@ -109,14 +109,21 @@
       "img": "icons/skills/melee/strike-sword-slashing-red.webp",
       "changes": [
         {
-          "key": "system.bonuses.roll.primaryWeapon.attack",
+          "key": "system.bonuses.roll.primaryWeapon.bonus",
           "mode": 2,
           "value": "1"
         }
       ],
-      "_id": "FlmOrbhYbieIAVJL",
+      "_id": "LvxPAfrKuRfgubGV",
       "type": "base",
-      "system": {},
+      "system": {
+        "rangeDependence": {
+          "enabled": false,
+          "type": "withinRange",
+          "target": "hostile",
+          "range": "melee"
+        }
+      },
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -132,14 +139,14 @@
         "compendiumSource": null,
         "duplicateSource": null,
         "exportSource": null,
-        "coreVersion": "13.346",
+        "coreVersion": "13.347",
         "systemId": "daggerheart",
-        "systemVersion": "0.0.1",
-        "createdTime": 1753831441325,
-        "modifiedTime": 1753831441325,
-        "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+        "systemVersion": "1.0.0",
+        "createdTime": 1754815023490,
+        "modifiedTime": 1754815023490,
+        "lastModifiedBy": "MQSznptE5yLT7kj8"
       },
-      "_key": "!items.effects!q382JqMkqLaaFLIr.FlmOrbhYbieIAVJL"
+      "_key": "!items.effects!q382JqMkqLaaFLIr.LvxPAfrKuRfgubGV"
     }
   ],
   "sort": 0,
@@ -152,12 +159,12 @@
     "compendiumSource": null,
     "duplicateSource": null,
     "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
     "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.0.0",
     "createdTime": 1753831418620,
-    "modifiedTime": 1753831441332,
-    "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+    "modifiedTime": 1754815023493,
+    "lastModifiedBy": "MQSznptE5yLT7kj8"
   },
   "_key": "!items!q382JqMkqLaaFLIr"
 }
diff --git a/src/packs/items/weapons/weapon_Knuckle_Claws_SFqganS8Du4aEKjQ.json b/src/packs/items/weapons/weapon_Knuckle_Claws_SFqganS8Du4aEKjQ.json
index c65353db..f2f53dc7 100644
--- a/src/packs/items/weapons/weapon_Knuckle_Claws_SFqganS8Du4aEKjQ.json
+++ b/src/packs/items/weapons/weapon_Knuckle_Claws_SFqganS8Du4aEKjQ.json
@@ -7,63 +7,22 @@
   "system": {
     "description": "",
     "actions": {
-      "fRKcEeShWSLkoExh": {
+      "B0uT1D1WRidiHxyh": {
         "type": "effect",
         "actionType": "action",
         "chatDisplay": true,
         "name": "Double Up",
         "description": "When you make an attack with your primary weapon, you can deal damage to another target within Melee range.",
         "img": "icons/skills/melee/strike-slashes-orange.webp",
-        "_id": "fRKcEeShWSLkoExh",
+        "_id": "B0uT1D1WRidiHxyh",
         "effects": [],
         "systemPath": "actions",
         "cost": [],
         "uses": {
           "value": null,
           "max": null,
-          "recovery": null
-        },
-        "target": {
-          "type": "any",
-          "amount": null
-        }
-      },
-      "lVsEmJwjYgpYL9l4": {
-        "type": "effect",
-        "actionType": "action",
-        "chatDisplay": true,
-        "name": "Double Up",
-        "description": "When you make an attack with your primary weapon, you can deal damage to another target within Melee range.",
-        "img": "icons/skills/melee/strike-slashes-orange.webp",
-        "_id": "lVsEmJwjYgpYL9l4",
-        "effects": [],
-        "systemPath": "actions",
-        "cost": [],
-        "uses": {
-          "value": null,
-          "max": null,
-          "recovery": null
-        },
-        "target": {
-          "type": "any",
-          "amount": null
-        }
-      },
-      "2ndqofzTHsEUMxsm": {
-        "type": "effect",
-        "actionType": "action",
-        "chatDisplay": true,
-        "name": "Double Up",
-        "description": "When you make an attack with your primary weapon, you can deal damage to another target within Melee range.",
-        "img": "icons/skills/melee/strike-slashes-orange.webp",
-        "_id": "2ndqofzTHsEUMxsm",
-        "effects": [],
-        "systemPath": "actions",
-        "cost": [],
-        "uses": {
-          "value": null,
-          "max": null,
-          "recovery": null
+          "recovery": null,
+          "consumeOnSuccess": false
         },
         "target": {
           "type": "any",
@@ -81,7 +40,7 @@
         "value": "doubledUp",
         "effectIds": [],
         "actionIds": [
-          "2ndqofzTHsEUMxsm"
+          "B0uT1D1WRidiHxyh"
         ]
       }
     ],
@@ -177,12 +136,12 @@
     "compendiumSource": null,
     "duplicateSource": null,
     "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
     "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.0.0",
     "createdTime": 1753797258168,
-    "modifiedTime": 1753798882899,
-    "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+    "modifiedTime": 1754814600761,
+    "lastModifiedBy": "MQSznptE5yLT7kj8"
   },
   "_key": "!items!SFqganS8Du4aEKjQ"
 }
diff --git a/src/packs/items/weapons/weapon_Legendary_Arcane_Frame_Wheelchair_gA2tiET9VHGhwMoO.json b/src/packs/items/weapons/weapon_Legendary_Arcane_Frame_Wheelchair_gA2tiET9VHGhwMoO.json
index 16211d24..a431d0c6 100644
--- a/src/packs/items/weapons/weapon_Legendary_Arcane_Frame_Wheelchair_gA2tiET9VHGhwMoO.json
+++ b/src/packs/items/weapons/weapon_Legendary_Arcane_Frame_Wheelchair_gA2tiET9VHGhwMoO.json
@@ -15,7 +15,7 @@
       {
         "value": "reliable",
         "effectIds": [
-          "G561ymlNGmaFAYFB"
+          "TvsoAiqHCwgtYat1"
         ],
         "actionIds": []
       }
@@ -108,14 +108,21 @@
       "img": "icons/skills/melee/strike-sword-slashing-red.webp",
       "changes": [
         {
-          "key": "system.bonuses.roll.primaryWeapon.attack",
+          "key": "system.bonuses.roll.primaryWeapon.bonus",
           "mode": 2,
           "value": "1"
         }
       ],
-      "_id": "G561ymlNGmaFAYFB",
+      "_id": "TvsoAiqHCwgtYat1",
       "type": "base",
-      "system": {},
+      "system": {
+        "rangeDependence": {
+          "enabled": false,
+          "type": "withinRange",
+          "target": "hostile",
+          "range": "melee"
+        }
+      },
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -131,12 +138,14 @@
         "compendiumSource": null,
         "duplicateSource": null,
         "exportSource": null,
-        "coreVersion": "13.346",
+        "coreVersion": "13.347",
         "systemId": "daggerheart",
-        "systemVersion": "0.0.1",
-        "lastModifiedBy": null
+        "systemVersion": "1.0.0",
+        "createdTime": 1754815308723,
+        "modifiedTime": 1754815308723,
+        "lastModifiedBy": "MQSznptE5yLT7kj8"
       },
-      "_key": "!items.effects!gA2tiET9VHGhwMoO.G561ymlNGmaFAYFB"
+      "_key": "!items.effects!gA2tiET9VHGhwMoO.TvsoAiqHCwgtYat1"
     }
   ],
   "ownership": {
@@ -148,12 +157,12 @@
     "compendiumSource": null,
     "duplicateSource": null,
     "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
     "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.0.0",
     "createdTime": 1753836717240,
-    "modifiedTime": 1753836812453,
-    "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+    "modifiedTime": 1754815308726,
+    "lastModifiedBy": "MQSznptE5yLT7kj8"
   },
   "_id": "gA2tiET9VHGhwMoO",
   "sort": 0,
diff --git a/src/packs/items/weapons/weapon_Legendary_Broadsword_y3hfTPfZhMognyaJ.json b/src/packs/items/weapons/weapon_Legendary_Broadsword_y3hfTPfZhMognyaJ.json
index ca0622de..32d19734 100644
--- a/src/packs/items/weapons/weapon_Legendary_Broadsword_y3hfTPfZhMognyaJ.json
+++ b/src/packs/items/weapons/weapon_Legendary_Broadsword_y3hfTPfZhMognyaJ.json
@@ -16,7 +16,7 @@
       {
         "value": "reliable",
         "effectIds": [
-          "lmUzKw6J6RW3krRT"
+          "ujb6VAqjyXmfnnjy"
         ],
         "actionIds": []
       }
@@ -109,14 +109,21 @@
       "img": "icons/skills/melee/strike-sword-slashing-red.webp",
       "changes": [
         {
-          "key": "system.bonuses.roll.primaryWeapon.attack",
+          "key": "system.bonuses.roll.primaryWeapon.bonus",
           "mode": 2,
           "value": "1"
         }
       ],
-      "_id": "lmUzKw6J6RW3krRT",
+      "_id": "ujb6VAqjyXmfnnjy",
       "type": "base",
-      "system": {},
+      "system": {
+        "rangeDependence": {
+          "enabled": false,
+          "type": "withinRange",
+          "target": "hostile",
+          "range": "melee"
+        }
+      },
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -132,14 +139,14 @@
         "compendiumSource": null,
         "duplicateSource": null,
         "exportSource": null,
-        "coreVersion": "13.346",
+        "coreVersion": "13.347",
         "systemId": "daggerheart",
-        "systemVersion": "0.0.1",
-        "createdTime": 1753834461846,
-        "modifiedTime": 1753834461846,
-        "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+        "systemVersion": "1.0.0",
+        "createdTime": 1754814961439,
+        "modifiedTime": 1754814961439,
+        "lastModifiedBy": "MQSznptE5yLT7kj8"
       },
-      "_key": "!items.effects!y3hfTPfZhMognyaJ.lmUzKw6J6RW3krRT"
+      "_key": "!items.effects!y3hfTPfZhMognyaJ.ujb6VAqjyXmfnnjy"
     }
   ],
   "sort": 0,
@@ -152,12 +159,12 @@
     "compendiumSource": null,
     "duplicateSource": null,
     "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
     "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.0.0",
     "createdTime": 1753834430378,
-    "modifiedTime": 1753834465538,
-    "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+    "modifiedTime": 1754814961454,
+    "lastModifiedBy": "MQSznptE5yLT7kj8"
   },
   "_key": "!items!y3hfTPfZhMognyaJ"
 }
diff --git a/src/packs/items/weapons/weapon_Legendary_Shortsword_dEumq3BIZBk5xYTk.json b/src/packs/items/weapons/weapon_Legendary_Shortsword_dEumq3BIZBk5xYTk.json
index 2f832ee7..5f6f6cb2 100644
--- a/src/packs/items/weapons/weapon_Legendary_Shortsword_dEumq3BIZBk5xYTk.json
+++ b/src/packs/items/weapons/weapon_Legendary_Shortsword_dEumq3BIZBk5xYTk.json
@@ -16,7 +16,7 @@
       {
         "value": "paired",
         "effectIds": [
-          "DgZQSBJx9JmoOngB"
+          "VFt61c2Apfbli2dG"
         ],
         "actionIds": []
       }
@@ -114,9 +114,16 @@
           "value": "ITEM.@system.tier + 1"
         }
       ],
-      "_id": "DgZQSBJx9JmoOngB",
+      "system": {
+        "rangeDependence": {
+          "enabled": true,
+          "range": "melee",
+          "target": "hostile",
+          "type": "withinRange"
+        }
+      },
+      "_id": "VFt61c2Apfbli2dG",
       "type": "base",
-      "system": {},
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -132,14 +139,14 @@
         "compendiumSource": null,
         "duplicateSource": null,
         "exportSource": null,
-        "coreVersion": "13.346",
+        "coreVersion": "13.347",
         "systemId": "daggerheart",
-        "systemVersion": "0.0.1",
-        "createdTime": 1753796957432,
-        "modifiedTime": 1753796957432,
-        "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+        "systemVersion": "1.0.0",
+        "createdTime": 1754814544486,
+        "modifiedTime": 1754814544486,
+        "lastModifiedBy": "MQSznptE5yLT7kj8"
       },
-      "_key": "!items.effects!dEumq3BIZBk5xYTk.DgZQSBJx9JmoOngB"
+      "_key": "!items.effects!dEumq3BIZBk5xYTk.VFt61c2Apfbli2dG"
     }
   ],
   "sort": 0,
@@ -152,12 +159,12 @@
     "compendiumSource": null,
     "duplicateSource": null,
     "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
     "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.0.0",
     "createdTime": 1753796913551,
-    "modifiedTime": 1753796957439,
-    "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+    "modifiedTime": 1754814544510,
+    "lastModifiedBy": "MQSznptE5yLT7kj8"
   },
   "_key": "!items!dEumq3BIZBk5xYTk"
 }
diff --git a/src/packs/items/weapons/weapon_Legendary_Small_Dagger_Px3Rh3kIvAqyISxJ.json b/src/packs/items/weapons/weapon_Legendary_Small_Dagger_Px3Rh3kIvAqyISxJ.json
index be3a5886..855ddd80 100644
--- a/src/packs/items/weapons/weapon_Legendary_Small_Dagger_Px3Rh3kIvAqyISxJ.json
+++ b/src/packs/items/weapons/weapon_Legendary_Small_Dagger_Px3Rh3kIvAqyISxJ.json
@@ -16,7 +16,7 @@
       {
         "value": "paired",
         "effectIds": [
-          "Wjl3MEwNdQPeY63u"
+          "rnVm0jSEtdWhKGCh"
         ],
         "actionIds": []
       }
@@ -114,9 +114,16 @@
           "value": "ITEM.@system.tier + 1"
         }
       ],
-      "_id": "Wjl3MEwNdQPeY63u",
+      "system": {
+        "rangeDependence": {
+          "enabled": true,
+          "range": "melee",
+          "target": "hostile",
+          "type": "withinRange"
+        }
+      },
+      "_id": "rnVm0jSEtdWhKGCh",
       "type": "base",
-      "system": {},
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -132,14 +139,14 @@
         "compendiumSource": null,
         "duplicateSource": null,
         "exportSource": null,
-        "coreVersion": "13.346",
+        "coreVersion": "13.347",
         "systemId": "daggerheart",
-        "systemVersion": "0.0.1",
-        "createdTime": 1753797088930,
-        "modifiedTime": 1753797088930,
-        "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+        "systemVersion": "1.0.0",
+        "createdTime": 1754814562988,
+        "modifiedTime": 1754814562988,
+        "lastModifiedBy": "MQSznptE5yLT7kj8"
       },
-      "_key": "!items.effects!Px3Rh3kIvAqyISxJ.Wjl3MEwNdQPeY63u"
+      "_key": "!items.effects!Px3Rh3kIvAqyISxJ.rnVm0jSEtdWhKGCh"
     }
   ],
   "sort": 0,
@@ -152,12 +159,12 @@
     "compendiumSource": null,
     "duplicateSource": null,
     "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
     "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.0.0",
     "createdTime": 1753797057472,
-    "modifiedTime": 1753797088933,
-    "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+    "modifiedTime": 1754814562995,
+    "lastModifiedBy": "MQSznptE5yLT7kj8"
   },
   "_key": "!items!Px3Rh3kIvAqyISxJ"
 }
diff --git a/src/packs/items/weapons/weapon_Primer_Shard_SxcblanBvqaest3A.json b/src/packs/items/weapons/weapon_Primer_Shard_SxcblanBvqaest3A.json
index 2b39a221..e3dd3035 100644
--- a/src/packs/items/weapons/weapon_Primer_Shard_SxcblanBvqaest3A.json
+++ b/src/packs/items/weapons/weapon_Primer_Shard_SxcblanBvqaest3A.json
@@ -7,21 +7,22 @@
   "system": {
     "description": "",
     "actions": {
-      "KGJJgz0SMdY0f0em": {
+      "dNN2KOfUxGzQ2yjY": {
         "type": "effect",
         "actionType": "action",
         "chatDisplay": true,
         "name": "Lock On",
         "description": "On a successful attack, your next attack against the same target with your primary weapon automatically succeeds.",
         "img": "icons/skills/targeting/crosshair-arrowhead-blue.webp",
-        "_id": "KGJJgz0SMdY0f0em",
+        "_id": "dNN2KOfUxGzQ2yjY",
         "effects": [],
         "systemPath": "actions",
         "cost": [],
         "uses": {
           "value": null,
           "max": null,
-          "recovery": null
+          "recovery": null,
+          "consumeOnSuccess": false
         },
         "target": {
           "type": "any",
@@ -36,10 +37,10 @@
     "burden": "oneHanded",
     "weaponFeatures": [
       {
-        "value": "lockedon",
+        "value": "lockedOn",
         "effectIds": [],
         "actionIds": [
-          "KGJJgz0SMdY0f0em"
+          "dNN2KOfUxGzQ2yjY"
         ]
       }
     ],
@@ -135,12 +136,12 @@
     "compendiumSource": null,
     "duplicateSource": null,
     "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
     "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.0.0",
     "createdTime": 1753797317938,
-    "modifiedTime": 1753797376548,
-    "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+    "modifiedTime": 1754814518028,
+    "lastModifiedBy": "MQSznptE5yLT7kj8"
   },
   "_key": "!items!SxcblanBvqaest3A"
 }
diff --git a/src/packs/items/weapons/weapon_Shortsword_cjGZpXCoshEqi1FI.json b/src/packs/items/weapons/weapon_Shortsword_cjGZpXCoshEqi1FI.json
index 92cb44b7..31cb74cd 100644
--- a/src/packs/items/weapons/weapon_Shortsword_cjGZpXCoshEqi1FI.json
+++ b/src/packs/items/weapons/weapon_Shortsword_cjGZpXCoshEqi1FI.json
@@ -16,7 +16,7 @@
       {
         "value": "paired",
         "effectIds": [
-          "VII5oRJrQTsSir0E"
+          "5RpOUFs0kDhzwltM"
         ],
         "actionIds": []
       }
@@ -114,9 +114,16 @@
           "value": "ITEM.@system.tier + 1"
         }
       ],
-      "_id": "VII5oRJrQTsSir0E",
+      "system": {
+        "rangeDependence": {
+          "enabled": true,
+          "range": "melee",
+          "target": "hostile",
+          "type": "withinRange"
+        }
+      },
+      "_id": "5RpOUFs0kDhzwltM",
       "type": "base",
-      "system": {},
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -132,14 +139,14 @@
         "compendiumSource": null,
         "duplicateSource": null,
         "exportSource": null,
-        "coreVersion": "13.346",
+        "coreVersion": "13.347",
         "systemId": "daggerheart",
-        "systemVersion": "0.0.1",
-        "createdTime": 1753793980974,
-        "modifiedTime": 1753793980974,
-        "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+        "systemVersion": "1.0.0",
+        "createdTime": 1754814729443,
+        "modifiedTime": 1754814729443,
+        "lastModifiedBy": "MQSznptE5yLT7kj8"
       },
-      "_key": "!items.effects!cjGZpXCoshEqi1FI.VII5oRJrQTsSir0E"
+      "_key": "!items.effects!cjGZpXCoshEqi1FI.5RpOUFs0kDhzwltM"
     }
   ],
   "sort": 0,
@@ -152,12 +159,12 @@
     "compendiumSource": null,
     "duplicateSource": null,
     "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
     "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.0.0",
     "createdTime": 1753741549716,
-    "modifiedTime": 1753793980983,
-    "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+    "modifiedTime": 1754814729447,
+    "lastModifiedBy": "MQSznptE5yLT7kj8"
   },
   "_key": "!items!cjGZpXCoshEqi1FI"
 }
diff --git a/src/packs/items/weapons/weapon_Small_Dagger_wKklDxs5nkzILNp4.json b/src/packs/items/weapons/weapon_Small_Dagger_wKklDxs5nkzILNp4.json
index 4e9613f6..229162f8 100644
--- a/src/packs/items/weapons/weapon_Small_Dagger_wKklDxs5nkzILNp4.json
+++ b/src/packs/items/weapons/weapon_Small_Dagger_wKklDxs5nkzILNp4.json
@@ -16,7 +16,7 @@
       {
         "value": "paired",
         "effectIds": [
-          "2OLsxbZJqMgk680J"
+          "wK6ccFAirp9HYK5Q"
         ],
         "actionIds": []
       }
@@ -114,9 +114,16 @@
           "value": "ITEM.@system.tier + 1"
         }
       ],
-      "_id": "2OLsxbZJqMgk680J",
+      "system": {
+        "rangeDependence": {
+          "enabled": true,
+          "range": "melee",
+          "target": "hostile",
+          "type": "withinRange"
+        }
+      },
+      "_id": "wK6ccFAirp9HYK5Q",
       "type": "base",
-      "system": {},
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -132,14 +139,14 @@
         "compendiumSource": null,
         "duplicateSource": null,
         "exportSource": null,
-        "coreVersion": "13.346",
+        "coreVersion": "13.347",
         "systemId": "daggerheart",
-        "systemVersion": "0.0.1",
-        "createdTime": 1753794165509,
-        "modifiedTime": 1753794165509,
-        "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+        "systemVersion": "1.0.0",
+        "createdTime": 1754814738851,
+        "modifiedTime": 1754814738851,
+        "lastModifiedBy": "MQSznptE5yLT7kj8"
       },
-      "_key": "!items.effects!wKklDxs5nkzILNp4.2OLsxbZJqMgk680J"
+      "_key": "!items.effects!wKklDxs5nkzILNp4.wK6ccFAirp9HYK5Q"
     }
   ],
   "sort": 0,
@@ -152,12 +159,12 @@
     "compendiumSource": null,
     "duplicateSource": null,
     "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
     "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.0.0",
     "createdTime": 1753744141625,
-    "modifiedTime": 1753794165511,
-    "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+    "modifiedTime": 1754814738854,
+    "lastModifiedBy": "MQSznptE5yLT7kj8"
   },
   "_key": "!items!wKklDxs5nkzILNp4"
 }
diff --git a/src/packs/items/weapons/weapon_Spiked_Shield_vzyzFwLUniWZV1rt.json b/src/packs/items/weapons/weapon_Spiked_Shield_vzyzFwLUniWZV1rt.json
index 8a40a800..9b9d691a 100644
--- a/src/packs/items/weapons/weapon_Spiked_Shield_vzyzFwLUniWZV1rt.json
+++ b/src/packs/items/weapons/weapon_Spiked_Shield_vzyzFwLUniWZV1rt.json
@@ -16,7 +16,7 @@
       {
         "value": "doubleDuty",
         "effectIds": [
-          "qo4VPSV0VZha1ya2"
+          "d3TJtlpoHBCztbom"
         ],
         "actionIds": []
       }
@@ -119,9 +119,16 @@
           "value": "1"
         }
       ],
-      "_id": "qo4VPSV0VZha1ya2",
+      "system": {
+        "rangeDependence": {
+          "enabled": true,
+          "range": "melee",
+          "target": "hostile",
+          "type": "withinRange"
+        }
+      },
+      "_id": "d3TJtlpoHBCztbom",
       "type": "base",
-      "system": {},
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -137,14 +144,14 @@
         "compendiumSource": null,
         "duplicateSource": null,
         "exportSource": null,
-        "coreVersion": "13.346",
+        "coreVersion": "13.347",
         "systemId": "daggerheart",
-        "systemVersion": "0.0.1",
-        "createdTime": 1753794551639,
-        "modifiedTime": 1753794551639,
-        "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+        "systemVersion": "1.0.0",
+        "createdTime": 1754814481208,
+        "modifiedTime": 1754814481208,
+        "lastModifiedBy": "MQSznptE5yLT7kj8"
       },
-      "_key": "!items.effects!vzyzFwLUniWZV1rt.qo4VPSV0VZha1ya2"
+      "_key": "!items.effects!vzyzFwLUniWZV1rt.d3TJtlpoHBCztbom"
     }
   ],
   "sort": 0,
@@ -157,12 +164,12 @@
     "compendiumSource": null,
     "duplicateSource": null,
     "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
     "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.0.0",
     "createdTime": 1753794535926,
-    "modifiedTime": 1753794665373,
-    "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+    "modifiedTime": 1754814481212,
+    "lastModifiedBy": "MQSznptE5yLT7kj8"
   },
   "_key": "!items!vzyzFwLUniWZV1rt"
 }
diff --git a/src/packs/items/weapons/weapon_Thistlebow_I1nDGpulg29GpWOW.json b/src/packs/items/weapons/weapon_Thistlebow_I1nDGpulg29GpWOW.json
index ca641ad2..cec5b0d1 100644
--- a/src/packs/items/weapons/weapon_Thistlebow_I1nDGpulg29GpWOW.json
+++ b/src/packs/items/weapons/weapon_Thistlebow_I1nDGpulg29GpWOW.json
@@ -16,7 +16,7 @@
       {
         "value": "reliable",
         "effectIds": [
-          "YA5tbB6XBISWsf0p"
+          "G9mMGxBSexwjWTYV"
         ],
         "actionIds": []
       }
@@ -109,14 +109,21 @@
       "img": "icons/skills/melee/strike-sword-slashing-red.webp",
       "changes": [
         {
-          "key": "system.bonuses.roll.primaryWeapon.attack",
+          "key": "system.bonuses.roll.primaryWeapon.bonus",
           "mode": 2,
           "value": "1"
         }
       ],
-      "_id": "YA5tbB6XBISWsf0p",
+      "_id": "G9mMGxBSexwjWTYV",
       "type": "base",
-      "system": {},
+      "system": {
+        "rangeDependence": {
+          "enabled": false,
+          "type": "withinRange",
+          "target": "hostile",
+          "range": "melee"
+        }
+      },
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -132,14 +139,14 @@
         "compendiumSource": null,
         "duplicateSource": null,
         "exportSource": null,
-        "coreVersion": "13.346",
+        "coreVersion": "13.347",
         "systemId": "daggerheart",
-        "systemVersion": "0.0.1",
-        "createdTime": 1753836322206,
-        "modifiedTime": 1753836322206,
-        "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+        "systemVersion": "1.0.0",
+        "createdTime": 1754815251133,
+        "modifiedTime": 1754815251133,
+        "lastModifiedBy": "MQSznptE5yLT7kj8"
       },
-      "_key": "!items.effects!I1nDGpulg29GpWOW.YA5tbB6XBISWsf0p"
+      "_key": "!items.effects!I1nDGpulg29GpWOW.G9mMGxBSexwjWTYV"
     }
   ],
   "sort": 0,
@@ -152,12 +159,12 @@
     "compendiumSource": null,
     "duplicateSource": null,
     "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
     "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.0.0",
     "createdTime": 1753836302436,
-    "modifiedTime": 1753836334493,
-    "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+    "modifiedTime": 1754815251135,
+    "lastModifiedBy": "MQSznptE5yLT7kj8"
   },
   "_key": "!items!I1nDGpulg29GpWOW"
 }
diff --git a/src/packs/items/weapons/weapon_War_Scythe_z6yEdFYQJ5IzgTX3.json b/src/packs/items/weapons/weapon_War_Scythe_z6yEdFYQJ5IzgTX3.json
index 458d8136..5d65a310 100644
--- a/src/packs/items/weapons/weapon_War_Scythe_z6yEdFYQJ5IzgTX3.json
+++ b/src/packs/items/weapons/weapon_War_Scythe_z6yEdFYQJ5IzgTX3.json
@@ -16,7 +16,7 @@
       {
         "value": "reliable",
         "effectIds": [
-          "Gt0tHtJDQwdSActw"
+          "cOYeI9TxHXpDwszu"
         ],
         "actionIds": []
       }
@@ -109,14 +109,21 @@
       "img": "icons/skills/melee/strike-sword-slashing-red.webp",
       "changes": [
         {
-          "key": "system.bonuses.roll.primaryWeapon.attack",
+          "key": "system.bonuses.roll.primaryWeapon.bonus",
           "mode": 2,
           "value": "1"
         }
       ],
-      "_id": "Gt0tHtJDQwdSActw",
+      "_id": "cOYeI9TxHXpDwszu",
       "type": "base",
-      "system": {},
+      "system": {
+        "rangeDependence": {
+          "enabled": false,
+          "type": "withinRange",
+          "target": "hostile",
+          "range": "melee"
+        }
+      },
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -132,14 +139,14 @@
         "compendiumSource": null,
         "duplicateSource": null,
         "exportSource": null,
-        "coreVersion": "13.346",
+        "coreVersion": "13.347",
         "systemId": "daggerheart",
-        "systemVersion": "0.0.1",
-        "createdTime": 1753829771677,
-        "modifiedTime": 1753829771677,
-        "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+        "systemVersion": "1.0.0",
+        "createdTime": 1754814992368,
+        "modifiedTime": 1754814992368,
+        "lastModifiedBy": "MQSznptE5yLT7kj8"
       },
-      "_key": "!items.effects!z6yEdFYQJ5IzgTX3.Gt0tHtJDQwdSActw"
+      "_key": "!items.effects!z6yEdFYQJ5IzgTX3.cOYeI9TxHXpDwszu"
     }
   ],
   "sort": 0,
@@ -152,12 +159,12 @@
     "compendiumSource": null,
     "duplicateSource": null,
     "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
     "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.0.0",
     "createdTime": 1753829740082,
-    "modifiedTime": 1753829771680,
-    "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+    "modifiedTime": 1754814992370,
+    "lastModifiedBy": "MQSznptE5yLT7kj8"
   },
   "_key": "!items!z6yEdFYQJ5IzgTX3"
 }
diff --git a/src/packs/journals/journal_Welcome___Information_g7NhKvwltwafmMyR.json b/src/packs/journals/journal_Welcome___Information_g7NhKvwltwafmMyR.json
index 6620d62c..af31907f 100644
--- a/src/packs/journals/journal_Welcome___Information_g7NhKvwltwafmMyR.json
+++ b/src/packs/journals/journal_Welcome___Information_g7NhKvwltwafmMyR.json
@@ -132,7 +132,7 @@
       "image": {},
       "text": {
         "format": 1,
-        "content": "<blockquote><p>This product includes materials from the Daggerheart System Reference Document 1.0, © Critical Role, LLC. under the terms of the Darrington Press Community Gaming (DPCGL) License. More information can be found at <a href=\"https://www.daggerheart.com/\" title=\"Daggerheart Official Website\">https://www.daggerheart.com</a>. There are no previous modifications by others.</p><p></p></blockquote><h1>The Foundryborne Team</h1><p></p><p>The Foundryborne Team consists of:</p><p></p><ul><li><p><strong>@harryfuralle</strong></p></li><li><p><strong>@cptn_cosmo</strong></p></li><li><p><strong>@molilo</strong></p></li><li><p><strong>@joaquinp98</strong></p></li><li><p><strong>@dapoulp</strong></p></li><li><p>@ikraik</p></li><li><p>@irktheimp</p></li><li><p>@jacobwojo</p></li><li><p>@vyrth</p></li><li><p>@.ontaro</p></li><li><p>@saatsin</p></li><li><p>@david.xyz</p></li><li><p>@<span style=\"color:oklab(0.988044 0.0000450313 0.0000197887);font-family:'gg sans', 'Noto Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:14px;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;orphans:2;text-align:start;text-indent:0px;text-transform:none;widows:2;word-spacing:0px;-webkit-text-stroke-width:0px;white-space:normal;background-color:oklab(0.262384 0.00252247 -0.00889932);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">lazjen</span></p></li></ul><p></p><p>With Art from:</p><p></p><ul><li><p>UsernameIsInUse</p></li></ul><p></p><p>And special thanks to our hard working community testers:<br /></p><ul><li><p><span style=\"color:oklab(0.988044 0.0000450313 0.0000197887);font-family:'gg sans', 'Noto Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:14px;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;orphans:2;text-align:start;text-indent:0px;text-transform:none;widows:2;word-spacing:0px;-webkit-text-stroke-width:0px;white-space:normal;background-color:oklab(0.262384 0.00252247 -0.00889932);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">@lazjen</span></p></li></ul><p></p><p>We would also like to thank the FoundryVTT team for their support in publishing this system.</p><p>And, of course, special thanks to the teams at Critical Role and Darrington Press for making such a wonderful game and updating the license to allow a FoundryVTT version of the system.</p><p></p><h1>The Foundryborne Community</h1><p></p><p>Without our amazing community this project would not have been possible.</p><p>You kept us going with both direct contributions and just endless support!</p><p>We thank you with all our hearts.</p><p><a href=\"https://foundryborne.online/\" title=\"Foundryborne official website\">Come join us!</a></p>"
+        "content": "<blockquote><p>This product includes materials from the Daggerheart System Reference Document 1.0, © Critical Role, LLC. under the terms of the Darrington Press Community Gaming (DPCGL) License. More information can be found at <a href=\"https://www.daggerheart.com/\" title=\"Daggerheart Official Website\">https://www.daggerheart.com</a>. There are no previous modifications by others.</p><p></p></blockquote><h1>The Foundryborne Team</h1><p></p><p>The Foundryborne Team consists of:</p><p></p><ul><li><p>@harryfuralle</p></li><li><p>@cptn_cosmo</p></li><li><p>@molilo</p></li><li><p>@joaquinp98</p></li><li><p>@dapoulp</p></li><li><p>@ikraik</p></li><li><p>@irktheimp</p></li><li><p>@jacobwojo</p></li><li><p>@vyrth</p></li><li><p>@.ontaro</p></li><li><p>@saatsin</p></li><li><p>@david.xyz</p></li><li><p>@lazjen</p></li></ul><p></p><p>With Art from:</p><p></p><ul><li><p>@molilo (Foundryborne User Interface &amp; Domain Card Placeholder Artwork)</p></li><li><p>@UsernameIsInUse (Foundryborne Logo, Website Design, Duality Roll Icon</p></li><li><p>@CyrensMaps (Combat Wheelchair Icons)</p></li></ul><p></p><p>And special thanks to our hard working community testers:<br /></p><ul><li><p>@lazjen</p></li></ul><p></p><p>We would also like to thank the FoundryVTT team for their support in publishing this system, as well as providing countless Icons to be used in many places.</p><p>And, of course, special thanks to the teams at Critical Role and Darrington Press for making such a wonderful game and updating the license to allow a FoundryVTT version of the system.</p><p></p><h1>The Foundryborne Community</h1><p></p><p>Without our amazing community this project would not have been possible.</p><p>You kept us going with both direct contributions and just endless support!</p><p>We thank you with all our hearts.</p><p><a href=\"https://foundryborne.online/\" title=\"Foundryborne official website\">Come join us!</a></p>"
       },
       "video": {
         "controls": true,
@@ -153,8 +153,8 @@
         "systemId": "daggerheart",
         "systemVersion": "0.0.1",
         "createdTime": 1754225939902,
-        "modifiedTime": 1754668980876,
-        "lastModifiedBy": "Cf0YKwnZ1OHBZWl8"
+        "modifiedTime": 1754847043391,
+        "lastModifiedBy": "9GFCfEY8m5Co2mHo"
       },
       "_key": "!journal.pages!g7NhKvwltwafmMyR.dP6xSKEld4TSqHhK"
     }
diff --git a/styles/less/sheets/actors/character/header.less b/styles/less/sheets/actors/character/header.less
index 5de7a827..7bfcc7c9 100644
--- a/styles/less/sheets/actors/character/header.less
+++ b/styles/less/sheets/actors/character/header.less
@@ -10,7 +10,7 @@
         }
 
         .character-row .domains-section img {
-            filter: invert(88%) sepia(98%) saturate(1784%) hue-rotate(311deg) brightness(104%) contrast(91%);
+            filter: @golden-filter;
         }
     }
 }, {
@@ -20,7 +20,7 @@
         }
 
         .character-row .domains-section img {
-            filter: invert(87%) sepia(15%) saturate(343%) hue-rotate(333deg) brightness(110%) contrast(87%);
+            filter: brightness(0) saturate(100%);
         }
     }
 });
diff --git a/styles/less/ui/resources/resources.less b/styles/less/ui/resources/resources.less
index 1f609c5e..3982d990 100644
--- a/styles/less/ui/resources/resources.less
+++ b/styles/less/ui/resources/resources.less
@@ -108,7 +108,7 @@
         box-shadow: unset;
         border-color: transparent;
         header,
-        .controls,
+        #resource-fear .controls,
         .window-resize-handle {
             opacity: 0;
         }
diff --git a/system.json b/system.json
index 7501cfa7..a0c91923 100644
--- a/system.json
+++ b/system.json
@@ -44,6 +44,10 @@
             "url": "https://github.com/joaquinpereyra98",
             "email": "joaquinpereyra98@gmail.com",
             "discord": "joaquinp98"
+        },
+        {
+            "name": "chrisryan10",
+            "discord": "lazjen"
         }
     ],
     "esmodules": ["build/daggerheart.js"],
@@ -262,6 +266,7 @@
             "abilityUse": {}
         }
     },
+    "background": "systems/daggerheart/assets/logos/FoundrybornBackgroundLogo.png",
     "primaryTokenAttribute": "resources.hitPoints",
     "secondaryTokenAttribute": "resources.stress",
     "url": "https://your/hosted/system/repo/",
diff --git a/templates/characterCreation/setupTabs/domainCards.hbs b/templates/characterCreation/setupTabs/domainCards.hbs
index 298d8859..66526689 100644
--- a/templates/characterCreation/setupTabs/domainCards.hbs
+++ b/templates/characterCreation/setupTabs/domainCards.hbs
@@ -10,9 +10,7 @@
                 {{#each domainCards as |domainCard id|}}
                     <div class="selections-container domain-card" data-card="{{id}}"> 
                         {{#> "systems/daggerheart/templates/components/card-preview.hbs" domainCard }}
-                            {{#each @root.class.system.domains }}
-                                <div>{{localize (concat "DAGGERHEART.GENERAL.Domain." this ".label")}}</div>
-                            {{/each}}
+                            {{#each @root.classDomains }}<div>{{this}}</div>{{/each}}
                         {{/"systems/daggerheart/templates/components/card-preview.hbs"}}
                     </div>
                 {{/each}}
diff --git a/templates/dialogs/dice-roll/damageSelection.hbs b/templates/dialogs/dice-roll/damageSelection.hbs
index be49906b..ba542666 100644
--- a/templates/dialogs/dice-roll/damageSelection.hbs
+++ b/templates/dialogs/dice-roll/damageSelection.hbs
@@ -24,7 +24,7 @@
             <input type="text" value="{{extraFormula}}" name="roll.{{ @index }}.extraFormula" placeholder="Situational Bonus">
         </div>
     {{/each}}
-    {{#if @root.modifiers}}
+    {{#unless (empty @root.modifiers)}}
         <fieldset class="modifier-container two-columns">
             <legend>{{localize "DAGGERHEART.GENERAL.Modifier.plural"}}</legend>
             {{#each @root.modifiers}}
@@ -39,7 +39,7 @@
                 {{/if}}
             {{/each}}
         </fieldset>
-    {{/if}}
+    {{/unless}}
     <div class="damage-section-controls">
         {{#if directDamage}}
             <select class="roll-mode-select" name="selectedRollMode">
diff --git a/templates/sheets/actors/character/header.hbs b/templates/sheets/actors/character/header.hbs
index b6f51bcf..7f598f55 100644
--- a/templates/sheets/actors/character/header.hbs
+++ b/templates/sheets/actors/character/header.hbs
@@ -87,9 +87,9 @@
         </div>
         {{#if document.system.class.value}}
             <div class="domains-section">
-                {{#each document.system.class.value.system.domains as |domain|}}
+                {{#each document.system.class.value.system.domainData as |data|}}
                     <div class="domain">
-                        <img src="{{concat 'systems/daggerheart/assets/icons/domains/' domain '.svg'}}" alt="" data-tooltip="{{localize (concat 'DAGGERHEART.GENERAL.Domain.' domain '.label')}}" />
+                        <img src="{{data.src}}" alt="" data-tooltip="{{data.label}}" />
                     </div>
                 {{/each}}
             </div>