diff --git a/wg-greyknights/module.json b/wg-greyknights/module.json
index 6ac3fd3..81a6552 100644
--- a/wg-greyknights/module.json
+++ b/wg-greyknights/module.json
@@ -1,7 +1,8 @@
 {
   "id": "wng-daemonhunters",
   "title": "Wrath & Glory: Daemonhunters (Grey Knights)",
-  "version": "0.6.4.1",
+  "description": "Grey Knights add-on for Wrath & Glory. Restored GK Archetype in compendium; GK items; Aegis/Brotherhood abilities; Sanctic powers; single-dialog autoload.",
+  "version": "0.6.4.2",
   "compatibility": {
     "minimum": "11",
     "verified": "13"
diff --git a/wg-greyknights/packs/daemonhunters.db b/wg-greyknights/packs/daemonhunters.db
index 466ced2..6a4ff0d 100644
--- a/wg-greyknights/packs/daemonhunters.db
+++ b/wg-greyknights/packs/daemonhunters.db
@@ -1,4 +1,4 @@
-{"name": "Aegis Power Armour", "type": "armour", "img": "modules/wng-core/assets/icons/armour/aquila-mk-vii.webp", "effects": [{"_id": "25aqxUBwyQtSAdxb", "name": "Aegis Wards (Constant)", "origin": null, "disabled": false, "duration": {"startTime": null, "combat": null}, "changes": [{"key": "system.skills.psychicMastery.bonus", "mode": 2, "value": "1", "priority": 20}, {"key": "system.combat.resolve.bonus", "mode": 2, "value": "1", "priority": 20}], "tint": "#ffffff", "transfer": true, "flags": {}, "system": {"transferData": {"equipTransfer": true, "type": "document", "originalType": "document", "documentType": "Actor", "avoidTest": {"value": "none", "opposed": false, "prevention": true, "reversed": false}, "testIndependent": false, "selfOnly": false, "prompt": false, "area": {"templateData": {"borderColor": null, "fillColor": null, "texture": null}, "keep": false, "aura": {"transferred": false, "render": false}, "duration": "sustained"}, "zone": {"type": "zone", "transferred": false, "traits": {}, "skipImmediateOnPlacement": false, "keep": false}}, "itemTargetData": {"ids": [], "allItems": false}, "scriptData": [], "zone": {"type": "zone", "traits": {}, "skipImmediateOnPlacement": false}, "sourceData": {"test": {}}}, "_stats": {"coreVersion": "13.347", "systemId": "wrath-and-glory", "systemVersion": "7.1.1", "lastModifiedBy": null}, "img": "icons/svg/aura.svg", "type": "base", "description": "", "statuses": [], "sort": 0}, {"_id": "LfRNsXknme6JLgSC", "name": "Aegis Warding Runes (Toggle)", "origin": null, "disabled": true, "duration": {"startTime": null, "combat": null}, "changes": [{"key": "system.combat.resilience.bonus", "mode": 2, "value": "1", "priority": 20}, {"key": "system.combat.defence.bonus", "mode": 2, "value": "-1", "priority": 20}], "tint": "#ffffff", "transfer": true, "flags": {}, "system": {"transferData": {"equipTransfer": true, "type": "document", "originalType": "document", "documentType": "Actor", "avoidTest": {"value": "none", "opposed": false, "prevention": true, "reversed": false}, "testIndependent": false, "selfOnly": false, "prompt": false, "area": {"templateData": {"borderColor": null, "fillColor": null, "texture": null}, "keep": false, "aura": {"transferred": false, "render": false}, "duration": "sustained"}, "zone": {"type": "zone", "transferred": false, "traits": {}, "skipImmediateOnPlacement": false, "keep": false}}, "itemTargetData": {"ids": [], "allItems": false}, "scriptData": [], "zone": {"type": "zone", "traits": {}, "skipImmediateOnPlacement": false}, "sourceData": {"test": {}}}, "_stats": {"coreVersion": "13.347", "systemId": "wrath-and-glory", "systemVersion": "7.1.1", "lastModifiedBy": null}, "img": "icons/svg/explosion.svg", "type": "base", "description": "", "statuses": [], "sort": 0}], "flags": {"wng-core": {"initialization-folder": "Armour", "sort": 0}, "core": {}}, "system": {"quantity": 1, "rarity": "", "description": "<p>Grey Knights sanctified power armour with hexagrammic wards and storm bolter forearm mount.</p><ul><li><b>AR 5</b>; <b>Powered (3)</b>.</li><li><b>Aegis (integrated):</b> Constant: +1 die to Deny the Witch and +1 die to resist Corruption.</li><li><b>Toggle (Action):</b> Aegis Warding Runes — runes glow; +1 Resilience, −1 Defence (vs ranged).</li></ul>", "value": 9, "keywords": "POWERED, IMPERIUM, ADEPTUS ASTARTES, GREY KNIGHTS, INQUISITION, DAEMONHUNTERS", "equipped": false, "rating": 5, "base": 0, "traits": {"list": [{"name": "powered", "rating": "3"}]}, "invulnerable": false}, "folder": "K59Lb8PvaCmIrviu", "_id": "11NZTwYXPlHBlnXC"}
+{"name": "Aegis Power Armour", "type": "armour", "img": "icons/svg/shield.svg", "effects": [{"_id": "25aqxUBwyQtSAdxb", "name": "Aegis Wards (Constant)", "origin": null, "disabled": false, "duration": {"startTime": null, "combat": null}, "changes": [{"key": "system.skills.psychicMastery.bonus", "mode": 2, "value": "1", "priority": 20}, {"key": "system.combat.resolve.bonus", "mode": 2, "value": "1", "priority": 20}], "tint": "#ffffff", "transfer": true, "flags": {}, "_stats": {"coreVersion": "13.347", "systemId": "wrath-and-glory", "systemVersion": "7.1.1", "lastModifiedBy": null}, "img": "icons/svg/aura.svg", "type": "base", "system": {"transferData": {"type": "document", "originalType": "document", "documentType": "Actor", "avoidTest": {"value": "none", "opposed": false, "prevention": true, "reversed": false}, "testIndependent": false, "equipTransfer": false, "selfOnly": false, "prompt": false, "area": {"templateData": {"borderColor": null, "fillColor": null, "texture": null}, "keep": false, "aura": {"transferred": false, "render": false}, "duration": "sustained"}, "zone": {"type": "zone", "transferred": false, "traits": {}, "skipImmediateOnPlacement": false, "keep": false}}, "itemTargetData": {"ids": [], "allItems": false}, "scriptData": [], "zone": {"type": "zone", "traits": {}, "skipImmediateOnPlacement": false}, "sourceData": {"test": {}}}, "description": "", "statuses": [], "sort": 0}, {"_id": "LfRNsXknme6JLgSC", "name": "Aegis Warding Runes (Toggle)", "origin": null, "disabled": true, "duration": {"startTime": null, "combat": null, "seconds": null, "rounds": null, "turns": null, "startRound": null, "startTurn": null}, "changes": [{"key": "system.combat.resilience.bonus", "mode": 2, "value": "1", "priority": 20}, {"key": "system.combat.defence.bonus", "mode": 2, "value": "-1", "priority": 20}], "tint": "#ffffff", "transfer": true, "flags": {"wrath-and-glory": {"manualEffectKeys": false}, "effectmacro": {"onEnable": {"script": "// Effect Macro — toggled: ON\nif (!item) return;\nconst candidates = [\n  \"system.invulnerable\",\n  \"system.armour.invulnerable\",\n  \"system.attributes.invulnerable\",\n  \"system.defences.invulnerable\"\n];\nconst path = candidates.find(p => foundry.utils.hasProperty(item, p)) ?? \"system.invulnerable\";\nawait item.update({ [path]: true });\n\n// (opcjonalnie) podbij też wartość/bonus na aktorze — odkomentuj jeśli Twój system tego używa\n/*\nconst apaths = [\"system.combat.invulnerable.bonus\", \"system.combat.invulnerable.value\"];\nconst apath  = apaths.find(p => foundry.utils.hasProperty(actor, p));\nif (apath) await actor.update({ [apath]: 1 });\n*/\n"}, "onDisable": {"script": "// Effect Macro — toggled: OFF\nif (!item) return;\nconst candidates = [\n  \"system.invulnerable\",\n  \"system.armour.invulnerable\",\n  \"system.attributes.invulnerable\",\n  \"system.defences.invulnerable\"\n];\nconst path = candidates.find(p => foundry.utils.hasProperty(item, p)) ?? \"system.invulnerable\";\nawait item.update({ [path]: false });\n\n// (opcjonalnie) wyzeruj bonus na aktorze\n/*\nconst apaths = [\"system.combat.invulnerable.bonus\", \"system.combat.invulnerable.value\"];\nconst apath  = apaths.find(p => foundry.utils.hasProperty(actor, p));\nif (apath) await actor.update({ [apath]: 0 });\n*/\n"}}}, "_stats": {"coreVersion": "13.347", "systemId": "wrath-and-glory", "systemVersion": "7.1.1", "lastModifiedBy": "ETeghv7x8fjtIEKK", "modifiedTime": 1755820582300}, "img": "icons/svg/explosion.svg", "type": "base", "system": {"transferData": {"type": "document", "originalType": "document", "documentType": "Actor", "avoidTest": {"value": "none", "opposed": false, "prevention": true, "reversed": false}, "testIndependent": false, "equipTransfer": false, "selfOnly": false, "prompt": false, "area": {"templateData": {"borderColor": null, "fillColor": null, "texture": null}, "keep": false, "aura": {"transferred": false, "render": false}, "duration": "sustained"}, "zone": {"type": "zone", "transferred": false, "traits": {}, "skipImmediateOnPlacement": false, "keep": false}}, "itemTargetData": {"ids": [], "allItems": false}, "scriptData": [], "zone": {"type": "zone", "traits": {}, "skipImmediateOnPlacement": false}, "sourceData": {"test": {}}}, "description": "", "statuses": [], "sort": 0}], "flags": {"wng-core": {"initialization-folder": "Armour", "sort": 0}, "core": {}}, "system": {"quantity": 1, "rarity": "unique", "description": "<p>Grey Knights sanctified power armour with hexagrammic wards and storm bolter forearm mount.</p><ul><li><strong>AR 5</strong>; <strong>Powered (3)</strong>.</li><li><strong>Aegis (integrated):</strong> Constant: +1 die to Deny the Witch and +1 die to resist Corruption.</li><li><strong>Toggle (Action):</strong> Aegis Warding Runes — runes glow; dramatically reduces stealth, reduces defense, reduces psychic mastery (it is an active psychic effect) but gives the armor invulnerable ability</li></ul>", "value": 9, "keywords": "POWERED, IMPERIUM, ADEPTUS ASTARTES, GREY KNIGHTS, INQUISITION, DAEMONHUNTERS", "equipped": false, "rating": 5, "base": 0, "traits": {"list": [{"name": "powered", "rating": "3"}]}, "invulnerable": false}, "folder": "K59Lb8PvaCmIrviu", "_id": "11NZTwYXPlHBlnXC"}
 {"name": "Grey Knight Armour Integrated Storm Bolter", "type": "weapon", "img": "modules/wng-core/assets/icons/weapons/storm-bolter.webp", "effects": [], "flags": {"wng-core": {"initialization-folder": "Weapons", "sort": 0}, "core": {}}, "system": {"quantity": 1, "rarity": "rare", "description": "<p>Integrated forearm storm bolter. <b>Integrated:</b> does not occupy hands; may fire while wielding two‑handed melee. Treat as Pistol for firing in melee.</p>", "value": 4, "keywords": "BOLT, INTEGRATED, IMPERIUM, ADEPTUS ASTARTES, GREY KNIGHTS, INQUISITION, DAEMONHUNTERS", "equipped": false, "attack": {"base": 0, "bonus": 0, "rank": "none"}, "damage": {"base": 10, "bonus": 0, "rank": 0, "ed": {"base": 2, "bonus": 0, "rank": 0, "dice": ""}, "ap": {"base": 0, "bonus": 0, "rank": 0, "dice": ""}, "enabled": false, "otherDamage": {"mortal": "0", "wounds": "0", "shock": "0"}, "dice": ""}, "ed": {"base": 0, "bonus": 0, "rank": 0}, "ap": {"base": 0, "bonus": 0, "rank": 0}, "category": "ranged", "range": {"short": 12, "medium": 24, "long": 36, "melee": 1, "thrown": null}, "ammo": {"id": ""}, "salvo": 1, "traits": {"list": [{"name": "brutal"}, {"name": "pistol"}, {"name": "rapidFire", "rating": "2"}]}, "upgrades": [], "otherDamage": {}, "combi": {}, "twinned": false}, "folder": "85dkcvhBYli5TJrZ", "_id": "SDFwequVtp6WsCFj"}
 {"name": "Terminator Aegis (Grey Knights)", "type": "armour", "img": "modules/wng-core/assets/icons/armour/terminator-armour.webp", "effects": [{"_id": "OvE7cPAtNLDdEj6j", "name": "Aegis Wards (Constant)", "origin": null, "disabled": false, "duration": {"startTime": null, "combat": null}, "changes": [{"key": "system.skills.psychicMastery.bonus", "mode": 2, "value": "1", "priority": 20}, {"key": "system.combat.resolve.bonus", "mode": 2, "value": "1", "priority": 20}], "tint": "#ffffff", "transfer": true, "flags": {}, "system": {"transferData": {"equipTransfer": true, "type": "document", "originalType": "document", "documentType": "Actor", "avoidTest": {"value": "none", "opposed": false, "prevention": true, "reversed": false}, "testIndependent": false, "selfOnly": false, "prompt": false, "area": {"templateData": {"borderColor": null, "fillColor": null, "texture": null}, "keep": false, "aura": {"transferred": false, "render": false}, "duration": "sustained"}, "zone": {"type": "zone", "transferred": false, "traits": {}, "skipImmediateOnPlacement": false, "keep": false}}, "itemTargetData": {"ids": [], "allItems": false}, "scriptData": [], "zone": {"type": "zone", "traits": {}, "skipImmediateOnPlacement": false}, "sourceData": {"test": {}}}, "_stats": {"coreVersion": "13.347", "systemId": "wrath-and-glory", "systemVersion": "7.1.1", "lastModifiedBy": null}, "img": "icons/svg/aura.svg", "type": "base", "description": "", "statuses": [], "sort": 0}, {"_id": "RXHERg7YjunnEQ8h", "name": "Aegis Warding Runes (Toggle)", "origin": null, "disabled": true, "duration": {"startTime": null, "combat": null}, "changes": [{"key": "system.combat.resilience.bonus", "mode": 2, "value": "1", "priority": 20}, {"key": "system.combat.defence.bonus", "mode": 2, "value": "-1", "priority": 20}], "tint": "#ffffff", "transfer": true, "flags": {}, "system": {"transferData": {"equipTransfer": true, "type": "document", "originalType": "document", "documentType": "Actor", "avoidTest": {"value": "none", "opposed": false, "prevention": true, "reversed": false}, "testIndependent": false, "selfOnly": false, "prompt": false, "area": {"templateData": {"borderColor": null, "fillColor": null, "texture": null}, "keep": false, "aura": {"transferred": false, "render": false}, "duration": "sustained"}, "zone": {"type": "zone", "transferred": false, "traits": {}, "skipImmediateOnPlacement": false, "keep": false}}, "itemTargetData": {"ids": [], "allItems": false}, "scriptData": [], "zone": {"type": "zone", "traits": {}, "skipImmediateOnPlacement": false}, "sourceData": {"test": {}}}, "_stats": {"coreVersion": "13.347", "systemId": "wrath-and-glory", "systemVersion": "7.1.1", "lastModifiedBy": null}, "img": "icons/svg/explosion.svg", "type": "base", "description": "", "statuses": [], "sort": 0}], "flags": {"wng-core": {"initialization-folder": "Armour", "sort": 0}, "core": {}}, "system": {"quantity": 1, "rarity": "", "description": "<p>Grey Knights Tactical Dreadnought armour with Aegis wards and storm bolter hard‑mount.</p><ul><li><b>AR 7</b>; <b>Powered (4)</b>; <b>Cumbersome</b>; counts as Large while worn.</li><li><b>Aegis (integrated):</b> Constant: +1 die to Deny the Witch and +1 die to resist Corruption.</li><li><b>Toggle (Action):</b> Aegis Warding Runes — +1 Resilience, −1 Defence (vs ranged).</li></ul>", "value": 10, "keywords": "POWERED, IMPERIUM, ADEPTUS ASTARTES, GREY KNIGHTS, INQUISITION, DAEMONHUNTERS", "equipped": false, "rating": 7, "base": 0, "traits": {"list": [{"name": "cumbersome"}, {"name": "powered", "rating": "4"}]}, "invulnerable": false}, "folder": "K59Lb8PvaCmIrviu", "_id": "9XTvCiJElW4LJij9"}
 {"name": "Nemesis Falchions (Pair)", "type": "weapon", "img": "modules/wng-core/assets/icons/weapons/force-sword.webp", "system": {"quantity": 1, "rarity": "unique", "description": "A matched pair of sanctified force blades. When wielding both, each attack may gain either +1 bonus die to WS or +1ED. Vs DAEMON/PSYKER: +1ED. Requires PSYKER to benefit from Force.", "value": 9, "keywords": "IMPERIUM, ADEPTUS ASTARTES, GREY KNIGHTS, SANCTIFIED", "equipped": false, "attack": {"base": 0, "bonus": 0, "rank": "none"}, "damage": {"base": 12, "bonus": 0, "rank": 0, "ed": {"base": 2, "bonus": 0, "rank": 0, "dice": ""}, "ap": {"base": -3, "bonus": 0, "rank": 0, "dice": ""}, "enabled": false, "otherDamage": {"mortal": "0", "wounds": "0", "shock": "0"}, "dice": ""}, "ed": {"base": 0, "bonus": 0, "rank": 0}, "ap": {"base": 0, "bonus": 0, "rank": 0}, "category": "melee", "range": {"short": 0, "medium": 0, "long": 0, "melee": 1, "thrown": null}, "ammo": {"id": ""}, "salvo": 0, "traits": {"list": [{"name": "force"}, {"name": "parry"}]}, "upgrades": [], "otherDamage": {}, "combi": {}, "twinned": false}, "effects": [], "folder": null, "flags": {}, "_id": "AUwZwmYWGCSH04m2"}
@@ -6,9 +6,12 @@
 {"name": "Psycannon", "type": "weapon", "img": "modules/wng-core/assets/icons/weapons/autocannon.webp", "system": {"quantity": 1, "rarity": "unique", "description": "Anti-daemonic bolt weapon. Vs DAEMON/PSYKER: +1ED. On Critical: gains Rending (1) for the result.", "value": 9, "keywords": "BOLT, IMPERIUM, ADEPTUS ASTARTES, GREY KNIGHTS, SANCTIFIED", "equipped": false, "attack": {"base": 0, "bonus": 0, "rank": "none"}, "damage": {"base": 14, "bonus": 0, "rank": 0, "ed": {"base": 3, "bonus": 0, "rank": 0, "dice": ""}, "ap": {"base": -2, "bonus": 0, "rank": 0, "dice": ""}, "enabled": false, "otherDamage": {"mortal": "0", "wounds": "0", "shock": "0"}, "dice": ""}, "ed": {"base": 0, "bonus": 0, "rank": 0}, "ap": {"base": 0, "bonus": 0, "rank": 0}, "category": "ranged", "range": {"short": 20, "medium": 40, "long": 60, "melee": 1, "thrown": null}, "ammo": {"id": ""}, "salvo": 2, "traits": {"list": [{"name": "heavy", "rating": "7"}, {"name": "rapidFire", "rating": "2"}]}, "upgrades": [], "otherDamage": {}, "combi": {}, "twinned": false}, "effects": [], "folder": null, "flags": {}, "_id": "luQa0ffP6nroOeN8"}
 {"name": "Psybolt Ammunition", "type": "ammo", "img": "modules/wng-core/assets/icons/ammo/ammo.webp", "system": {"quantity": 1, "rarity": "unique", "description": "Upgrade for BOLT/Storm Bolter weapons. Grants +1ED. Against DAEMON/PSYKER, attacks gain Rending (1). Apply manually to attack resolving rules; conditional effects are not automated.", "value": 5, "keywords": "BOLT, SANCTIFIED", "effect": "", "traits": {"list": []}}, "effects": [], "folder": null, "flags": {}, "_id": "ozxEfipXNkP69SHr"}
 {"name": "Pilgrim Astartes Plate (Disguise Armour)", "type": "armour", "img": "modules/wng-core/assets/icons/armour/terminator-armour.webp", "effects": [{"_id": "44rACWx99MiXXe4E", "name": "Pilgrim Disguise Penalties", "icon": "icons/svg/downgrade.svg", "origin": "", "disabled": false, "duration": {"startTime": null, "seconds": null, "turns": null, "startRound": null, "startTurn": null}, "changes": [{"key": "system.attributes.agility.bonus", "mode": 2, "value": -1, "priority": 20}, {"key": "system.skills.stealth.bonus", "mode": 2, "value": -1, "priority": 20}, {"key": "system.combat.speed", "mode": 2, "value": -1, "priority": 20}], "tint": null, "transfer": true, "flags": {}}], "flags": {"wng-core": {"initialization-folder": "Armour", "sort": 0}, "core": {}}, "system": {"quantity": 1, "rarity": "rare", "description": "<p>Scavenged Black Templars plate, patched & lightened. Designed for incognito operations.</p><ul><li><b>AR 4</b>; <b>Powered (1)</b>; <b>Cumbersome</b>.</li><li><b>Penalty (Active Effect):</b> −1 die to Agility- and Stealth-based Tests while worn; −1 Speed (homebrew).</li><li>Appears as Templar armour at a glance; close inspection may reveal inconsistencies.</li></ul>", "value": 6, "keywords": "POWERED, IMPERIUM, ADEPTUS ASTARTES, BLACK TEMPLARS (DISGUISE)", "equipped": true, "rating": 4, "base": 0, "traits": {"list": [{"name": "cumbersome"}, {"name": "powered", "rating": "1"}]}, "invulnerable": false}, "folder": "K59Lb8PvaCmIrviu", "_id": "2P2HioialQdFUCv6"}
-{"name": "Aegis of Titan", "type": "ability", "img": "modules/wng-core/assets/icons/abilities/adeptus-astartes.webp", "effects": [{"name": "Aegis of Titan (Innate)", "img": "modules/wng-core/assets/icons/abilities/adeptus-astartes.webp", "_id": "f6b0a8f61b17498c", "type": "base", "system": {"transferData": {"type": "document", "originalType": "document", "documentType": "Actor", "avoidTest": {"value": "none", "opposed": false, "prevention": true, "reversed": false}, "testIndependent": false, "equipTransfer": true, "selfOnly": false, "prompt": false, "area": {"templateData": {"borderColor": null, "fillColor": null, "texture": null}, "keep": false, "aura": {"transferred": false, "render": false}, "duration": "sustained"}, "zone": {"type": "zone", "transferred": false, "traits": {}, "skipImmediateOnPlacement": false, "keep": false}}, "itemTargetData": {"ids": [], "allItems": false}, "scriptData": [], "zone": {"type": "zone", "traits": {}, "skipImmediateOnPlacement": false}, "sourceData": {"test": {}}}, "changes": [{"key": "flags.wng-daemonhunters.denyBonus", "mode": 2, "value": "1", "priority": 10}, {"key": "flags.wng-daemonhunters.corruptionResistInnate", "mode": 2, "value": "1", "priority": 10}], "disabled": false, "transfer": true}], "system": {"description": "<p>Innate sanctity of a Grey Knight. +1 bonus die to <em>Deny the Witch</em>; +1 to resist Corruption. If equipped with Aegis armour, gain an additional +1 to resist Corruption.</p>", "cost": 0, "requirements": "GREY KNIGHTS"}, "_id": "4fbdc9cbbdce43b6"}
-{"name": "Brotherhood of Psykers", "type": "ability", "img": "modules/wng-core/assets/icons/abilities/adeptus-astartes.webp", "effects": [], "system": {"description": "<p>You gain the <strong>PSYKER</strong> Keyword and know Universal Psyker Abilities and <em>Smite</em>. When you gain this Ability, choose one Discipline: <strong>Librarius</strong> or <strong>Sanctic</strong>. Learn one power from the chosen Discipline.</p>", "cost": 0, "requirements": "GREY KNIGHTS"}, "_id": "8e147a2e47594051"}
-{"name": "Hammerhand (Sanctic)", "type": "psychicPower", "img": "modules/wng-core/assets/icons/powers/power.webp", "effects": [], "system": {"dn": "7", "cost": 10, "activation": "action", "duration": "Sustained", "range": "Self", "keywords": "PSYCHIC, SANCTIC", "description": "<p>Melee attacks gain +1ED until the start of your next Turn (persists while Sustained). Optionally spend 3 Shock on activation to gain +1 DN to resist Disarm/Shove.</p>"}, "_id": "62d8b2491f1b408d"}
-{"name": "Sanctuary (Sanctic)", "type": "psychicPower", "img": "modules/wng-core/assets/icons/powers/power.webp", "effects": [], "system": {"dn": "7", "cost": 15, "activation": "action", "duration": "Sustained", "range": "Aura 5 m", "keywords": "PSYCHIC, SANCTIC", "description": "<p>Allies in the aura gain +1 to Resolve vs Fear/Corruption; their attacks count as Sanctified vs DAEMON for overcoming Resistances (GM adjudication). Ends if you are Incapacitated.</p>"}, "_id": "604ee438dd144a72"}
-{"name": "The Shrouding (Sanctic)", "type": "psychicPower", "img": "modules/wng-core/assets/icons/powers/power.webp", "effects": [], "system": {"dn": "7", "cost": 10, "activation": "action", "duration": "Sustained", "range": "Self or Ally within 15 m", "keywords": "PSYCHIC, SANCTIC", "description": "<p>Attacks against the target suffer +1 DN (ranged) while Sustained; moving more than normal Speed ends the effect at end of Turn. Potency (table): also +1 DN melee.</p>"}, "_id": "3326bd6d147441ae"}
-{"name": "Might of Titan (Sanctic)", "type": "psychicPower", "img": "modules/wng-core/assets/icons/powers/power.webp", "effects": [], "system": {"dn": "7", "cost": 15, "activation": "action", "duration": "Sustained", "range": "15 m", "keywords": "PSYCHIC, SANCTIC", "description": "<p>Target ally gains +1 to Strength-based Tests and +1ED on melee attacks; while Sustained, the bonuses persist. Potency (table): also +1 to Toughness Tests.</p>"}, "_id": "169a9cb337844a44"}
+{"name": "Nemesis Force Halberd", "type": "weapon", "img": "modules/wng-core/assets/icons/weapons/force-stave.webp", "system": {"quantity": 1, "rarity": "unique", "value": 7, "description": "Grey Knight Nemesis Halberd (treated as Force Stave; +1 DMG baseline for GK; +1ED vs Daemons & Psykers — narrative).", "keywords": "FORCE, ADEPTUS ASTARTES, GREY KNIGHTS, 2-HANDED", "equipped": false, "damage": {"base": 12, "ed": {"base": 2}, "ap": {"base": -1}, "enabled": false, "otherDamage": {"mortal": "0", "wounds": "0", "shock": "0"}}, "category": "melee", "range": {"melee": 2, "short": 0, "medium": 0, "long": 0}, "traits": {"list": [{"name": "force"}, {"name": "parry"}]}}, "effects": [], "flags": {}, "_id": "71e5ec3cd2b14fa4"}
+{"name": "Aegis of Titan", "type": "ability", "img": "modules/wng-core/assets/icons/abilities/adeptus-astartes.webp", "effects": [{"name": "Aegis of Titan (Innate)", "img": "modules/wng-core/assets/icons/abilities/adeptus-astartes.webp", "_id": "8872d1e71d2c4b2a", "type": "base", "system": {"transferData": {"type": "document", "originalType": "document", "documentType": "Actor", "avoidTest": {"value": "none", "opposed": false, "prevention": true, "reversed": false}, "testIndependent": false, "equipTransfer": true, "selfOnly": false, "prompt": false, "area": {"templateData": {"borderColor": null, "fillColor": null, "texture": null}, "keep": false, "aura": {"transferred": false, "render": false}, "duration": "sustained"}, "zone": {"type": "zone", "transferred": false, "traits": {}, "skipImmediateOnPlacement": false, "keep": false}}, "scriptData": [], "itemTargetData": {"ids": [], "allItems": false}, "zone": {"type": "zone", "traits": {}, "skipImmediateOnPlacement": false}, "sourceData": {"test": {}}}, "changes": [{"key": "flags.wng-daemonhunters.denyBonus", "mode": 2, "value": "1", "priority": 10}, {"key": "flags.wng-daemonhunters.corruptionResistInnate", "mode": 2, "value": "1", "priority": 10}], "disabled": false, "transfer": true}], "system": {"description": "<p>Innate sanctity of a Grey Knight. +1 bonus die to <em>Deny the Witch</em>; +1 to resist Corruption. If equipped with Aegis armour, gain an additional +1 to resist Corruption.</p>", "cost": 0, "requirements": "GREY KNIGHTS"}, "_id": "bb3bccb475804f5c"}
+{"name": "Brotherhood of Psykers", "type": "ability", "img": "modules/wng-core/assets/icons/abilities/adeptus-astartes.webp", "effects": [], "system": {"description": "<p>You gain the <strong>PSYKER</strong> Keyword and know Universal Psyker Abilities and <em>Smite</em>. When you gain this Ability, choose one Discipline: <strong>Librarius</strong> or <strong>Sanctic</strong>. Learn one power from the chosen Discipline.</p>", "cost": 0, "requirements": "GREY KNIGHTS"}, "_id": "afd071e300664fc6"}
+{"name": "Might of Heroes", "type": "psychicPower", "img": "modules/wng-core/assets/icons/powers/power.webp", "effects": [{"_id": "dE9A7AKv5dhN9tmI", "changes": [{"key": "system.attributes.strength.bonus", "mode": 2, "value": "@test.result.bonus", "priority": null}, {"key": "system.attributes.toughness.bonus", "mode": 2, "value": "@test.result.bonus", "priority": null}, {"key": "system.attributes.initiative.bonus", "mode": 2, "value": "@test.result.bonus", "priority": null}], "disabled": false, "duration": {"startTime": null, "seconds": null, "combat": null, "rounds": null, "turns": null, "startRound": null, "startTurn": null}, "transfer": false, "flags": {"wrath-and-glory": {"migrated": true, "manualEffectKeys": false}}, "tint": "#ffffff", "origin": null, "name": "Might of Heroes", "description": "", "statuses": [], "_stats": {"coreVersion": "13.347", "systemId": "wrath-and-glory", "systemVersion": "7.1.1", "lastModifiedBy": null}, "img": "modules/wng-core/assets/icons/powers/power.webp", "type": "base", "system": {"transferData": {"type": "target", "originalType": "document", "documentType": "Actor", "avoidTest": {"value": "none", "opposed": false, "prevention": true, "reversed": false}, "testIndependent": false, "equipTransfer": false, "selfOnly": false, "prompt": false, "area": {"templateData": {"borderColor": null, "fillColor": null, "texture": null}, "keep": false, "aura": {"transferred": false, "render": false}, "duration": "sustained"}, "zone": {"type": "zone", "transferred": false, "traits": {}, "skipImmediateOnPlacement": false, "keep": false}}, "scriptData": [{"script": "[Script.iUUp4ouubYFUgtuB]", "label": "Delete", "trigger": "updateCombat", "options": {"targeter": false, "deleteEffect": false, "defending": false}, "async": false}], "itemTargetData": {"ids": [], "allItems": false}, "zone": {"type": "zone", "traits": {}, "skipImmediateOnPlacement": false}, "sourceData": {"test": {}}}, "sort": 0}], "folder": "XeqLNhxj3ih0QuHM", "flags": {"wng-forsaken": {"initialization-folder": "Psychic Powers", "sort": 0}, "core": {}}, "system": {"dn": "7", "description": "<p>Summoning the labyrinthine lore of your Librarius, you bestow the martial might of ancestral Astartes brethren unto your ally, siphoning the Warp to empower their form.&nbsp;</p>\n<p>Your target gains +1 Strength, Toughness, and Initiative until the start of your next Turn.&nbsp;</p>", "effect": "", "cost": 15, "activation": "action", "duration": "Sustained", "range": "15 m", "multiTarget": false, "keywords": "PSYCHIC", "prerequisites": "ADEPTUS ASTARTES Keyword", "damage": {"base": 0, "bonus": 0, "rank": 0, "ed": {"base": 0, "bonus": 0, "rank": 0}, "otherDamage": {"wounds": "", "shock": "", "mortal": "0"}, "enabled": false, "ap": {"base": 0, "bonus": 0, "rank": 0}}, "potency": {"list": [{"description": "Your target gains an additional +1 Strength, Toughness, and Initiative.", "cost": 3, "property": "bonus", "initial": "1", "value": "1", "single": false}]}, "test": {"dn": null, "type": "", "self": false}, "traits": {"list": []}}, "_id": "t3zyqiQP8J16yRpS"}
+{"name": "Hammerhand (Sanctic)", "type": "psychicPower", "img": "modules/wng-core/assets/icons/powers/power.webp", "effects": [], "system": {"dn": "7", "cost": 10, "activation": "action", "duration": "Sustained", "range": "Self", "keywords": "PSYCHIC, SANCTIC", "description": "<p>Melee attacks gain +1ED until the start of your next Turn (persists while Sustained). Optionally spend 3 Shock on activation to gain +1 DN to resist Disarm/Shove.</p>"}, "_id": "9e8737e9f92e4532"}
+{"name": "Sanctuary (Sanctic)", "type": "psychicPower", "img": "modules/wng-core/assets/icons/powers/power.webp", "effects": [], "system": {"dn": "7", "cost": 15, "activation": "action", "duration": "Sustained", "range": "Aura 5 m", "keywords": "PSYCHIC, SANCTIC", "description": "<p>Allies in the aura gain +1 to Resolve vs Fear/Corruption; their attacks count as Sanctified vs DAEMON for overcoming Resistances (GM adjudication). Ends if you are Incapacitated.</p>"}, "_id": "a15a5a18f5974dca"}
+{"name": "The Shrouding (Sanctic)", "type": "psychicPower", "img": "modules/wng-core/assets/icons/powers/power.webp", "effects": [], "system": {"dn": "7", "cost": 10, "activation": "action", "duration": "Sustained", "range": "Self or Ally within 15 m", "keywords": "PSYCHIC, SANCTIC", "description": "<p>Attacks against the target suffer +1 DN (ranged) while Sustained; moving more than normal Speed ends the effect at end of Turn. Potency: also +1 DN melee.</p>"}, "_id": "df6a8672ccb14f55"}
+{"name": "Might of Titan (Sanctic)", "type": "psychicPower", "img": "modules/wng-core/assets/icons/powers/power.webp", "effects": [], "system": {"dn": "7", "cost": 15, "activation": "action", "duration": "Sustained", "range": "15 m", "keywords": "PSYCHIC, SANCTIC", "description": "<p>Target ally gains +1 to Strength-based Tests and +1ED on melee attacks; while Sustained, the bonuses persist. Potency: also +1 to Toughness Tests.</p>"}, "_id": "3a2f1d3395884f24"}
+{"name": "Grey Knight", "type": "archetype", "img": "modules/wng-core/assets/images/archetype-astartes-librarian.webp", "effects": [], "system": {"tier": 4, "journal": "", "species": {"name": "Adeptus Astartes", "id": ""}, "faction": {"name": "Adeptus Astartes", "id": ""}, "influence": 2, "cost": 360, "keywords": ["IMPERIUM", "ADEPTUS ASTARTES", "GREY KNIGHTS", "INQUISITION", "DAEMONHUNTERS"], "attributes": {"strength": 5, "toughness": 5, "agility": 5, "initiative": 5, "willpower": 6, "intellect": 3, "fellowship": 2}, "skills": {"athletics": 3, "awareness": 3, "ballisticSkill": 5, "leadership": 1, "psychicMastery": 4, "scholar": 2, "stealth": 3, "survival": 1, "weaponSkill": 5}, "ability": {"name": "Aegis of Titan", "id": ""}, "wargear": {"structure": {"type": "and", "groupId": "root", "id": "root", "options": []}, "options": []}}, "_id": "57753a87bde04745"}
diff --git a/wg-greyknights/scripts/auto-gk-archetype.js b/wg-greyknights/scripts/auto-gk-archetype.js
index 15cda79..3aa99e7 100644
--- a/wg-greyknights/scripts/auto-gk-archetype.js
+++ b/wg-greyknights/scripts/auto-gk-archetype.js
@@ -1,4 +1,4 @@
-// WNG-Daemonhunters 0.6.4.1 — single dialog GK autoload (no clashes)
+// WNG-Daemonhunters 0.6.4.2 — GK autoload (single dialog, restored Archetype in pack)
 Hooks.once('ready', () => console.log("WNG-Daemonhunters | Auto-loadout ready"));
 
 async function addFromPackByName(actor, packKey, name, equip=false) {
@@ -27,14 +27,14 @@ Hooks.on('createItem', async (item, options, userId) => {
     const actor = item.parent;
     if (!actor || item.type !== 'archetype' || item.name !== 'Grey Knight') return;
     if (game.userId !== userId) return;
-    if (actor.getFlag('wng-daemonhunters','gkLoaded')) return; // prevent double-run
+    if (actor.getFlag('wng-daemonhunters','gkLoaded')) return;
 
     const content = `<p>Select initial loadout for <strong>Grey Knight</strong>:</p>
     <div class="form-group"><label>Loadout</label>
       <select id="gk-loadout">
-        <option value="incog">Incognito — Pilgrim Astartes Plate + Astartes Combat Knife + Bolt Pistol</option>
-        <option value="power" selected>War‑Plate — Aegis Power Armour + Nemesis Force Halberd + Integrated Storm Bolter</option>
-        <option value="termi">Terminator — Terminator Aegis + Nemesis Force Halberd + Integrated Storm Bolter</option>
+        <option value="incog">Incognito — Pilgrim Astartes Plate (Disguise Armour) + Astartes Combat Knife + Bolt Pistol</option>
+        <option value="power" selected>War‑Plate — Aegis Power Armour + Nemesis Force Halberd + Grey Knight Armour Integrated Storm Bolter</option>
+        <option value="termi">Terminator — Terminator Aegis (Grey Knights) + Nemesis Force Halberd + Grey Knight Armour Integrated Storm Bolter</option>
       </select>
     </div>`;
 
@@ -46,23 +46,23 @@ Hooks.on('createItem', async (item, options, userId) => {
           const choice = html.find('#gk-loadout').val();
           const PACK = "wng-daemonhunters.daemonhunters";
 
-          // Base abilities always
+          // Core abilities
           await addFromPackByName(actor, PACK, "Aegis of Titan");
           await addFromPackByName(actor, PACK, "Brotherhood of Psykers");
           await addFromPackByName(actor, PACK, "Might of Heroes");
 
           if (choice === 'incog') {
-            await addFromPackByName(actor, PACK, "Pilgrim Astartes Power Armour", true);
+            await addFromPackByName(actor, PACK, "Pilgrim Astartes Plate (Disguise Armour)", true);
             await addFromUuid(actor, "Compendium.wng-core.items.Item.4QVBQYWXXLyvFWkj", true); // Knife
             await addFromUuid(actor, "Compendium.wng-core.items.Item.7b2xcPWBB7up65PM", true); // Bolt Pistol
           } else if (choice === 'power') {
             await addFromPackByName(actor, PACK, "Aegis Power Armour", true);
-            await addFromPackByName(actor, PACK, "Grey Knight Armour Integrated Storm Bolter", true);
             await addFromPackByName(actor, PACK, "Nemesis Force Halberd", true);
+            await addFromPackByName(actor, PACK, "Grey Knight Armour Integrated Storm Bolter", true);
           } else if (choice === 'termi') {
             await addFromPackByName(actor, PACK, "Terminator Aegis (Grey Knights)", true);
-            await addFromPackByName(actor, PACK, "Grey Knight Armour Integrated Storm Bolter", true);
             await addFromPackByName(actor, PACK, "Nemesis Force Halberd", true);
+            await addFromPackByName(actor, PACK, "Grey Knight Armour Integrated Storm Bolter", true);
           }
 
           await actor.setFlag('wng-daemonhunters','gkLoaded', true);