diff --git a/daggerheart.mjs b/daggerheart.mjs
index 644d6d86..f1d8c67a 100644
--- a/daggerheart.mjs
+++ b/daggerheart.mjs
@@ -17,7 +17,6 @@ import {
     socketRegistration
 } from './module/systemRegistration/_module.mjs';
 import { placeables } from './module/canvas/_module.mjs';
-import { registerRollDiceHooks } from './module/dice/dhRoll.mjs';
 import './node_modules/@yaireo/tagify/dist/tagify.css';
 import TemplateManager from './module/documents/templateManager.mjs';
 
@@ -54,6 +53,8 @@ CONFIG.Canvas.rulerClass = placeables.DhRuler;
 CONFIG.Canvas.layers.templates.layerClass = placeables.DhTemplateLayer;
 CONFIG.MeasuredTemplate.objectClass = placeables.DhMeasuredTemplate;
 
+CONFIG.Scene.documentClass = documents.DhScene;
+
 CONFIG.Token.documentClass = documents.DhToken;
 CONFIG.Token.prototypeSheetClass = applications.sheetConfigs.DhPrototypeTokenConfig;
 CONFIG.Token.objectClass = placeables.DhTokenPlaceable;
@@ -89,34 +90,94 @@ Hooks.once('init', () => {
         makeDefault: true
     });
 
+    const sheetLabel = typePath => () =>
+        game.i18n.format('DAGGERHEART.GENERAL.typeSheet', {
+            type: game.i18n.localize(typePath)
+        });
+
     const { Items, Actors } = foundry.documents.collections;
     Items.unregisterSheet('core', foundry.applications.sheets.ItemSheetV2);
-    Items.registerSheet(SYSTEM.id, applications.sheets.items.Ancestry, { types: ['ancestry'], makeDefault: true });
-    Items.registerSheet(SYSTEM.id, applications.sheets.items.Community, { types: ['community'], makeDefault: true });
-    Items.registerSheet(SYSTEM.id, applications.sheets.items.Class, { types: ['class'], makeDefault: true });
-    Items.registerSheet(SYSTEM.id, applications.sheets.items.Subclass, { types: ['subclass'], makeDefault: true });
-    Items.registerSheet(SYSTEM.id, applications.sheets.items.Feature, { types: ['feature'], makeDefault: true });
-    Items.registerSheet(SYSTEM.id, applications.sheets.items.DomainCard, { types: ['domainCard'], makeDefault: true });
+    Items.registerSheet(SYSTEM.id, applications.sheets.items.Ancestry, {
+        types: ['ancestry'],
+        makeDefault: true,
+        label: sheetLabel('TYPES.Item.ancestry')
+    });
+    Items.registerSheet(SYSTEM.id, applications.sheets.items.Community, {
+        types: ['community'],
+        makeDefault: true,
+        label: sheetLabel('TYPES.Item.community')
+    });
+    Items.registerSheet(SYSTEM.id, applications.sheets.items.Class, {
+        types: ['class'],
+        makeDefault: true,
+        label: sheetLabel('TYPES.Item.class')
+    });
+    Items.registerSheet(SYSTEM.id, applications.sheets.items.Subclass, {
+        types: ['subclass'],
+        makeDefault: true,
+        label: sheetLabel('TYPES.Item.subclass')
+    });
+    Items.registerSheet(SYSTEM.id, applications.sheets.items.Feature, {
+        types: ['feature'],
+        makeDefault: true,
+        label: sheetLabel('TYPES.Item.feature')
+    });
+    Items.registerSheet(SYSTEM.id, applications.sheets.items.DomainCard, {
+        types: ['domainCard'],
+        makeDefault: true,
+        label: sheetLabel('TYPES.Item.domainCard')
+    });
     Items.registerSheet(SYSTEM.id, applications.sheets.items.Loot, {
         types: ['loot'],
-        makeDefault: true
+        makeDefault: true,
+        label: sheetLabel('TYPES.Item.loot')
+    });
+    Items.registerSheet(SYSTEM.id, applications.sheets.items.Consumable, {
+        types: ['consumable'],
+        makeDefault: true,
+        label: sheetLabel('TYPES.Item.consumable')
+    });
+    Items.registerSheet(SYSTEM.id, applications.sheets.items.Weapon, {
+        types: ['weapon'],
+        makeDefault: true,
+        label: sheetLabel('TYPES.Item.weapon')
+    });
+    Items.registerSheet(SYSTEM.id, applications.sheets.items.Armor, {
+        types: ['armor'],
+        makeDefault: true,
+        label: sheetLabel('TYPES.Item.armor')
+    });
+    Items.registerSheet(SYSTEM.id, applications.sheets.items.Beastform, {
+        types: ['beastform'],
+        makeDefault: true,
+        label: sheetLabel('TYPES.Item.beastform')
     });
-    Items.registerSheet(SYSTEM.id, applications.sheets.items.Consumable, { types: ['consumable'], makeDefault: true });
-    Items.registerSheet(SYSTEM.id, applications.sheets.items.Weapon, { types: ['weapon'], makeDefault: true });
-    Items.registerSheet(SYSTEM.id, applications.sheets.items.Armor, { types: ['armor'], makeDefault: true });
-    Items.registerSheet(SYSTEM.id, applications.sheets.items.Beastform, { types: ['beastform'], makeDefault: true });
 
     Actors.unregisterSheet('core', foundry.applications.sheets.ActorSheetV2);
-    Actors.registerSheet(SYSTEM.id, applications.sheets.actors.Character, { types: ['character'], makeDefault: true });
-    Actors.registerSheet(SYSTEM.id, applications.sheets.actors.Companion, { types: ['companion'], makeDefault: true });
-    Actors.registerSheet(SYSTEM.id, applications.sheets.actors.Adversary, { types: ['adversary'], makeDefault: true });
+    Actors.registerSheet(SYSTEM.id, applications.sheets.actors.Character, {
+        types: ['character'],
+        makeDefault: true,
+        label: sheetLabel('TYPES.Actor.character')
+    });
+    Actors.registerSheet(SYSTEM.id, applications.sheets.actors.Companion, {
+        types: ['companion'],
+        makeDefault: true,
+        label: sheetLabel('TYPES.Actor.companion')
+    });
+    Actors.registerSheet(SYSTEM.id, applications.sheets.actors.Adversary, {
+        types: ['adversary'],
+        makeDefault: true,
+        label: sheetLabel('TYPES.Actor.adversary')
+    });
     Actors.registerSheet(SYSTEM.id, applications.sheets.actors.Environment, {
         types: ['environment'],
-        makeDefault: true
+        makeDefault: true,
+        label: sheetLabel('TYPES.Actor.environment')
     });
     Actors.registerSheet(SYSTEM.id, applications.sheets.actors.Party, {
         types: ['party'],
-        makeDefault: true
+        makeDefault: true,
+        label: sheetLabel('TYPES.Actor.party')
     });
 
     DocumentSheetConfig.unregisterSheet(
@@ -129,7 +190,8 @@ Hooks.once('init', () => {
         SYSTEM.id,
         applications.sheetConfigs.ActiveEffectConfig,
         {
-            makeDefault: true
+            makeDefault: true,
+            label: sheetLabel('DOCUMENT.ActiveEffect')
         }
     );
 
@@ -138,9 +200,10 @@ Hooks.once('init', () => {
     // Make Compendium Dialog resizable
     foundry.applications.sidebar.apps.Compendium.DEFAULT_OPTIONS.window.resizable = true;
 
+    DocumentSheetConfig.unregisterSheet(foundry.documents.Scene, 'core', foundry.applications.sheets.SceneConfig);
     DocumentSheetConfig.registerSheet(foundry.documents.Scene, SYSTEM.id, applications.scene.DhSceneConfigSettings, {
         makeDefault: true,
-        label: 'Daggerheart'
+        label: sheetLabel('DOCUMENT.Scene')
     });
 
     settingsRegistration.registerDHSettings();
@@ -177,7 +240,6 @@ Hooks.on('ready', async () => {
         ui.compendiumBrowser = new applications.ui.ItemBrowser();
 
     socketRegistration.registerSocketHooks();
-    registerRollDiceHooks();
     socketRegistration.registerUserQueries();
 
     if (!game.user.getFlag(CONFIG.DH.id, CONFIG.DH.FLAGS.userFlags.welcomeMessage)) {
@@ -193,9 +255,9 @@ Hooks.on('ready', async () => {
 
 Hooks.once('dicesoniceready', () => {});
 
-Hooks.on('renderChatMessageHTML', (_, element, message) => {
+Hooks.on('renderChatMessageHTML', (document, element) => {
     enricherRenderSetup(element);
-    const cssClass = message.message.flags?.daggerheart?.cssClass;
+    const cssClass = document.flags?.daggerheart?.cssClass;
     if (cssClass) cssClass.split(' ').forEach(cls => element.classList.add(cls));
 });
 
@@ -248,52 +310,70 @@ Hooks.on('chatMessage', (_, message) => {
     }
 });
 
-Hooks.on('moveToken', async (movedToken, data) => {
-    const effectsAutomation = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation).effects;
-    if (!effectsAutomation.rangeDependent) return;
+const updateActorsRangeDependentEffects = async token => {
+    const rangeMeasurement = game.settings.get(
+        CONFIG.DH.id,
+        CONFIG.DH.SETTINGS.gameSettings.variantRules
+    ).rangeMeasurement;
 
-    const rangeDependantEffects = movedToken.actor.effects.filter(effect => effect.system.rangeDependence?.enabled);
+    for (let effect of token.actor.allApplicableEffects()) {
+        if (!effect.system.rangeDependence?.enabled) continue;
+        const { target, range, type } = effect.system.rangeDependence;
 
-    const updateEffects = async (disposition, token, effects, effectUpdates) => {
-        const rangeMeasurement = game.settings.get(
-            CONFIG.DH.id,
-            CONFIG.DH.SETTINGS.gameSettings.variantRules
-        ).rangeMeasurement;
-
-        for (let effect of effects.filter(x => x.system.rangeDependence?.enabled)) {
-            const { target, range, type } = effect.system.rangeDependence;
-            if ((target === 'friendly' && disposition !== 1) || (target === 'hostile' && disposition !== -1))
-                return false;
+        // If there are no targets, assume false. Otherwise, start with the effect enabled.
+        let enabledEffect = game.user.targets.size !== 0;
+        // Expect all targets to meet the rangeDependence requirements
+        for (let userTarget of game.user.targets) {
+            const disposition = userTarget.document.disposition;
+            if ((target === 'friendly' && disposition !== 1) || (target === 'hostile' && disposition !== -1)) {
+                enabledEffect = false;
+                break;
+            }
 
             const distanceBetween = canvas.grid.measurePath([
-                { ...movedToken.toObject(), x: data.destination.x, y: data.destination.y },
-                token
+                userTarget.document.movement.destination,
+                token.movement.destination
             ]).distance;
             const distance = rangeMeasurement[range];
 
             const reverse = type === CONFIG.DH.GENERAL.rangeInclusion.outsideRange.id;
-            const newDisabled = reverse ? distanceBetween <= distance : distanceBetween > distance;
-            const oldDisabled = effectUpdates[effect.uuid] ? effectUpdates[effect.uuid].disabled : newDisabled;
-            effectUpdates[effect.uuid] = {
-                disabled: oldDisabled || newDisabled,
-                value: effect
-            };
-        }
-    };
-
-    const effectUpdates = {};
-    for (let token of game.scenes.find(x => x.active).tokens) {
-        if (token.id !== movedToken.id) {
-            await updateEffects(token.disposition, token, rangeDependantEffects, effectUpdates);
+            if (reverse ? distanceBetween <= distance : distanceBetween > distance) {
+                enabledEffect = false;
+                break;
+            }
         }
 
-        if (token.actor) await updateEffects(movedToken.disposition, token, token.actor.effects, effectUpdates);
+        await effect.update({ disabled: !enabledEffect });
     }
+};
 
-    for (let key in effectUpdates) {
-        const effect = effectUpdates[key];
-        await effect.value.update({ disabled: effect.disabled });
+const updateAllRangeDependentEffects = async () => {
+    const effectsAutomation = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation).effects;
+    if (!effectsAutomation.rangeDependent) return;
+
+    // Only consider tokens on the active scene
+    const tokens = game.scenes.find(x => x.active).tokens;
+    if (game.user.character) {
+        // The character updates their character's token. There can be only one token.
+        const characterToken = tokens.find(x => x.actor === game.user.character);
+        updateActorsRangeDependentEffects(characterToken);
+    } else if (game.user.isGM) {
+        // The GM is responsible for all other tokens.
+        const playerCharacters = game.users.players.filter(x => x.active).map(x => x.character);
+        for (let token of tokens.filter(x => !playerCharacters.includes(x.actor))) {
+            updateActorsRangeDependentEffects(token);
+        }
     }
+};
+
+const debouncedRangeEffectCall = foundry.utils.debounce(updateAllRangeDependentEffects, 50);
+
+Hooks.on('targetToken', async (user, token, targeted) => {
+    debouncedRangeEffectCall();
+});
+
+Hooks.on('moveToken', async (movedToken, data) => {
+    debouncedRangeEffectCall();
 });
 
 Hooks.on('renderCompendiumDirectory', (app, html) => applications.ui.ItemBrowser.injectSidebarButton(html));
diff --git a/lang/en.json b/lang/en.json
index 32717fcb..828b2303 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -36,6 +36,7 @@
     },
 
     "DAGGERHEART": {
+        "CharacterSheet": "Character Sheet",
         "ACTIONS": {
             "TYPES": {
                 "attack": {
@@ -585,6 +586,7 @@
             },
             "OwnershipSelection": {
                 "title": "Ownership Selection - {name}",
+                "noPlayers": "No players to assign ownership to",
                 "default": "Default Ownership"
             },
             "ReactionRoll": {
@@ -611,6 +613,9 @@
                 "insufficientHope": "The initiating character doesn't have enough hope",
                 "createTagTeam": "Create TagTeam Roll",
                 "chatMessageRollTitle": "Roll"
+            },
+            "TokenConfig": {
+                "actorSizeUsed": "Actor size is set, determining the dimensions"
             }
         },
         "CLASS": {
@@ -620,11 +625,6 @@
             }
         },
         "CONFIG": {
-            "ActionType": {
-                "passive": "Passive",
-                "action": "Action",
-                "reaction": "Reaction"
-            },
             "AdversaryTrait": {
                 "relentless": {
                     "name": "Relentless",
@@ -1033,6 +1033,12 @@
                     "description": ""
                 }
             },
+            "FeatureForm": {
+                "label": "Feature Form",
+                "passive": "Passive",
+                "action": "Action",
+                "reaction": "Reaction"
+            },
             "Gold": {
                 "title": "Gold",
                 "coins": "Coins",
@@ -1146,6 +1152,14 @@
                 "rect": "Rectangle",
                 "ray": "Ray"
             },
+            "TokenSize": {
+                "tiny": "Tiny",
+                "small": "Small",
+                "medium": "Medium",
+                "large": "Large",
+                "huge": "Huge",
+                "gargantuan": "Gargantuan"
+            },
             "Traits": {
                 "agility": {
                     "name": "Agility",
@@ -2094,6 +2108,7 @@
             "fear": "Fear",
             "features": "Features",
             "formula": "Formula",
+            "general": "General",
             "gm": "GM",
             "healing": "Healing",
             "healingRoll": "Healing Roll",
@@ -2166,10 +2181,12 @@
                 "plural": "Targets"
             },
             "title": "Title",
+            "tokenSize": "Token Size",
             "total": "Total",
             "traitModifier": "Trait Modifier",
             "true": "True",
             "type": "Type",
+            "typeSheet": "System {type} Sheet",
             "unarmed": "Unarmed",
             "unarmedAttack": "Unarmed Attack",
             "unarmored": "Unarmored",
@@ -2222,6 +2239,7 @@
                     "tokenRingImg": { "label": "Subject Texture" },
                     "tokenSize": {
                         "placeholder": "Using character dimensions",
+                        "disabledPlaceholder": "Set by character size",
                         "height": { "label": "Height" },
                         "width": { "label": "Width" }
                     },
@@ -2247,7 +2265,9 @@
                 "hybridizeFeatureTitle": "Hybrid Features",
                 "hybridizeDrag": "Drag a form here to hybridize it.",
                 "mainTrait": "Main Trait",
-                "traitBonus": "Trait Bonus"
+                "traitBonus": "Trait Bonus",
+                "evolvedTokenHint": "An evolved beastform's token is based on that of the form you evolve",
+                "evolvedImagePlaceholder": "The image for the form selected for evolution will be used"
             },
             "Class": {
                 "hopeFeatures": "Hope Features",
@@ -2527,8 +2547,8 @@
                         "enabled": { "label": "Enabled" },
                         "tokens": { "label": "Tokens" }
                     },
-                    "massiveDamage":{
-                        "title":"Massive Damage",
+                    "massiveDamage": {
+                        "title": "Massive Damage",
                         "enabled": { "label": "Enabled" }
                     }
                 }
@@ -2800,7 +2820,9 @@
                 "companionPartnerLevelBlock": "The companion needs an assigned partner to level up.",
                 "configureAttribution": "Configure Attribution",
                 "deleteItem": "Delete Item",
-                "immune": "Immune"
+                "immune": "Immune",
+                "middleClick": "[Middle Click] Keep tooltip view",
+                "tokenSize": "The token size used on the canvas"
             }
         }
     }
diff --git a/module/applications/dialogs/d20RollDialog.mjs b/module/applications/dialogs/d20RollDialog.mjs
index b28a3ffb..d872a1f8 100644
--- a/module/applications/dialogs/d20RollDialog.mjs
+++ b/module/applications/dialogs/d20RollDialog.mjs
@@ -104,7 +104,7 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
             context.roll = this.roll;
             context.rollType = this.roll?.constructor.name;
             context.rallyDie = this.roll.rallyChoices;
-            const experiences = this.config.data?.experiences || {};
+            const experiences = this.config.data?.system.experiences || {};
             context.experiences = Object.keys(experiences).map(id => ({
                 id,
                 ...experiences[id]
@@ -185,7 +185,7 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
                           extKey: button.dataset.key,
                           key: this.config?.data?.parent?.isNPC ? 'fear' : 'hope',
                           value: 1,
-                          name: this.config.data?.experiences?.[button.dataset.key]?.name
+                          name: this.config.data?.system.experiences?.[button.dataset.key]?.name
                       }
                   ];
         this.render();
@@ -195,9 +195,9 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
         if (this.config.roll) {
             this.reactionOverride = !this.reactionOverride;
             this.config.actionType = this.reactionOverride
-                ? CONFIG.DH.ITEM.actionTypes.reaction.id
-                : this.config.actionType === CONFIG.DH.ITEM.actionTypes.reaction.id
-                  ? CONFIG.DH.ITEM.actionTypes.action.id
+                ? 'reaction'
+                : this.config.actionType === 'reaction'
+                  ? 'action'
                   : this.config.actionType;
             this.render();
         }
diff --git a/module/applications/dialogs/downtime.mjs b/module/applications/dialogs/downtime.mjs
index 96e06446..3d5b7f0f 100644
--- a/module/applications/dialogs/downtime.mjs
+++ b/module/applications/dialogs/downtime.mjs
@@ -93,7 +93,7 @@ export default class DhpDowntime extends HandlebarsApplicationMixin(ApplicationV
     }
 
     getRefreshables() {
-        const actionItems = this.actor.items.reduce((acc, x) => {
+        const actionItems = this.actor.items.filter(x => this.actor.system.isItemAvailable(x)).reduce((acc, x) => {
             if (x.system.actions) {
                 const recoverable = x.system.actions.reduce((acc, action) => {
                     if (refreshIsAllowed([this.shortrest ? 'shortRest' : 'longRest'], action.uses.recovery)) {
diff --git a/module/applications/dialogs/itemTransfer.mjs b/module/applications/dialogs/itemTransfer.mjs
index aba43d27..ad3cf103 100644
--- a/module/applications/dialogs/itemTransfer.mjs
+++ b/module/applications/dialogs/itemTransfer.mjs
@@ -1,69 +1,61 @@
 const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api;
 
 export default class ItemTransferDialog extends HandlebarsApplicationMixin(ApplicationV2) {
-    constructor(item) {
+    constructor(data) {
         super({});
-
-        this.item = item;
-        this.quantity = item.system.quantity;
+        this.data = data;
     }
 
     get title() {
-        return this.item.name;
+        return this.data.title;
     }
 
     static DEFAULT_OPTIONS = {
         tag: 'form',
         classes: ['daggerheart', 'dh-style', 'dialog', 'item-transfer'],
-        position: { width: 300, height: 'auto' },
+        position: { width: 400, height: 'auto' },
         window: { icon: 'fa-solid fa-hand-holding-hand' },
         actions: {
             finish: ItemTransferDialog.#finish
-        },
-        form: { handler: this.updateData, submitOnChange: true, closeOnSubmit: false }
+        }
     };
 
     static PARTS = {
-        main: { template: 'systems/daggerheart/templates/dialogs/item-transfer.hbs' }
+        main: { template: 'systems/daggerheart/templates/dialogs/item-transfer.hbs', root: true }
     };
 
-    _attachPartListeners(partId, htmlElement, options) {
-        super._attachPartListeners(partId, htmlElement, options);
-
-        htmlElement.querySelector('.number-display').addEventListener('change', event => {
-            this.quantity = isNaN(event.target.value) ? this.quantity : Number(event.target.value);
-            this.render();
-        });
-    }
-
     async _prepareContext(_options) {
         const context = await super._prepareContext(_options);
-        context.item = this.item;
-        context.quantity = this.quantity;
-
-        return context;
-    }
-
-    static async updateData(_event, _element, formData) {
-        const { quantity } = foundry.utils.expandObject(formData.object);
-        this.quantity = quantity;
-        this.render();
+        return foundry.utils.mergeObject(context, this.data);
     }
 
     static async #finish() {
-        this.close({ submitted: true });
+        this.selected = this.form.elements.quantity.valueAsNumber || null;
+        this.close();
     }
 
-    close(options = {}) {
-        if (!options.submitted) this.quantity = null;
+    static #determineTransferOptions({ originActor, targetActor, item, currency }) {
+        originActor ??= item?.actor;
+        const homebrewKey = CONFIG.DH.SETTINGS.gameSettings.Homebrew;
+        const currencySetting = game.settings.get(CONFIG.DH.id, homebrewKey).currency?.[currency] ?? null;
 
-        super.close();
+        return {
+            originActor,
+            targetActor,
+            itemImage: item?.img,
+            currencyIcon: currencySetting?.icon,
+            max: item?.system.quantity ?? originActor.system.gold[currency] ?? 0,
+            title: item?.name ?? currencySetting?.label
+        };
     }
 
-    static async configure(item) {
+    static async configure(options) {
         return new Promise(resolve => {
-            const app = new this(item);
-            app.addEventListener('close', () => resolve(app.quantity), { once: true });
+            const data = this.#determineTransferOptions(options);
+            if (data.max <= 1) return resolve(data.max);
+
+            const app = new this(data);
+            app.addEventListener('close', () => resolve(app.selected), { once: true });
             app.render({ force: true });
         });
     }
diff --git a/module/applications/dialogs/ownershipSelection.mjs b/module/applications/dialogs/ownershipSelection.mjs
index 049f4d99..64173221 100644
--- a/module/applications/dialogs/ownershipSelection.mjs
+++ b/module/applications/dialogs/ownershipSelection.mjs
@@ -38,7 +38,6 @@ export default class OwnershipSelection extends HandlebarsApplicationMixin(Appli
 
     async _prepareContext(_options) {
         const context = await super._prepareContext(_options);
-        context.ownershipDefaultOptions = CONFIG.DH.GENERAL.basicOwnershiplevels;
         context.ownershipOptions = CONFIG.DH.GENERAL.simpleOwnershiplevels;
         context.defaultOwnership = this.defaultOwnership;
         context.ownership = game.users.reduce((acc, user) => {
@@ -52,6 +51,7 @@ export default class OwnershipSelection extends HandlebarsApplicationMixin(Appli
 
             return acc;
         }, {});
+        context.showOwnership = Boolean(Object.keys(context.ownership).length);
 
         return context;
     }
diff --git a/module/applications/dialogs/tagTeamDialog.mjs b/module/applications/dialogs/tagTeamDialog.mjs
index b53d03ab..0bc4bf0c 100644
--- a/module/applications/dialogs/tagTeamDialog.mjs
+++ b/module/applications/dialogs/tagTeamDialog.mjs
@@ -220,8 +220,8 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
                         !roll.system.isCritical && criticalRoll
                             ? (await getCritDamageBonus(damage.formula)) + damage.total
                             : damage.total;
+                    const updatedDamageParts = damage.parts;
                     if (systemData.damage[key]) {
-                        const updatedDamageParts = damage.parts;
                         if (!roll.system.isCritical && criticalRoll) {
                             for (let part of updatedDamageParts) {
                                 const criticalDamage = await getCritDamageBonus(part.formula);
diff --git a/module/applications/levelup/characterLevelup.mjs b/module/applications/levelup/characterLevelup.mjs
index 623f0308..f7ef2ffa 100644
--- a/module/applications/levelup/characterLevelup.mjs
+++ b/module/applications/levelup/characterLevelup.mjs
@@ -280,11 +280,19 @@ export default class DhCharacterLevelUp extends LevelUpBase {
                                     break;
                                 case 'experience':
                                     if (!advancement[choiceKey]) advancement[choiceKey] = [];
+                                    const allExperiences = {
+                                        ...this.actor.system.experiences,
+                                        ...Object.values(this.levelup.levels).reduce((acc, level) => {
+                                            for (const key of Object.keys(level.achievements.experiences)) {
+                                                acc[key] = level.achievements.experiences[key];
+                                            }
+
+                                            return acc;
+                                        }, {})
+                                    };
                                     const data = checkbox.data.map(data => {
-                                        const experience = Object.keys(this.actor.system.experiences).find(
-                                            x => x === data
-                                        );
-                                        return this.actor.system.experiences[experience]?.name ?? '';
+                                        const experience = Object.keys(allExperiences).find(x => x === data);
+                                        return allExperiences[experience]?.name ?? '';
                                     });
                                     advancement[choiceKey].push({ data: data, value: checkbox.value });
                                     break;
diff --git a/module/applications/levelup/levelup.mjs b/module/applications/levelup/levelup.mjs
index c3cc6e81..ba6110cc 100644
--- a/module/applications/levelup/levelup.mjs
+++ b/module/applications/levelup/levelup.mjs
@@ -357,11 +357,23 @@ export default class DhlevelUp extends HandlebarsApplicationMixin(ApplicationV2)
 
         const experienceIncreaseTagify = htmlElement.querySelector('.levelup-experience-increases');
         if (experienceIncreaseTagify) {
+            const allExperiences = {
+                ...this.actor.system.experiences,
+                ...Object.values(this.levelup.levels).reduce((acc, level) => {
+                    for (const key of Object.keys(level.achievements.experiences)) {
+                        acc[key] = level.achievements.experiences[key];
+                    }
+
+                    return acc;
+                }, {})
+            };
             tagifyElement(
                 experienceIncreaseTagify,
-                Object.keys(this.actor.system.experiences).reduce((acc, id) => {
-                    const experience = this.actor.system.experiences[id];
-                    acc.push({ id: id, label: experience.name });
+                Object.keys(allExperiences).reduce((acc, id) => {
+                    const experience = allExperiences[id];
+                    if (experience.name) {
+                        acc.push({ id: id, label: experience.name });
+                    }
 
                     return acc;
                 }, []),
diff --git a/module/applications/settings/homebrewSettings.mjs b/module/applications/settings/homebrewSettings.mjs
index 6d36a2b3..3c4486c1 100644
--- a/module/applications/settings/homebrewSettings.mjs
+++ b/module/applications/settings/homebrewSettings.mjs
@@ -44,6 +44,7 @@ export default class DhHomebrewSettings extends HandlebarsApplicationMixin(Appli
             deleteAdversaryType: this.deleteAdversaryType,
             selectAdversaryType: this.selectAdversaryType,
             save: this.save,
+            resetTokenSizes: this.resetTokenSizes,
             reset: this.reset
         },
         form: { handler: this.updateData, submitOnChange: true }
@@ -424,6 +425,14 @@ export default class DhHomebrewSettings extends HandlebarsApplicationMixin(Appli
         this.close();
     }
 
+    static async resetTokenSizes() {
+        await this.settings.updateSource({
+            tokenSizes: this.settings.schema.fields.tokenSizes.initial
+        });
+
+        this.render();
+    }
+
     static async reset() {
         const confirmed = await foundry.applications.api.DialogV2.confirm({
             window: {
diff --git a/module/applications/sheets-configs/action-base-config.mjs b/module/applications/sheets-configs/action-base-config.mjs
index 70252642..7190a5b7 100644
--- a/module/applications/sheets-configs/action-base-config.mjs
+++ b/module/applications/sheets-configs/action-base-config.mjs
@@ -98,7 +98,7 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
 
     async _prepareContext(_options) {
         const context = await super._prepareContext(_options, 'action');
-        context.source = this.action.toObject(false);
+        context.source = this.action._source;
         context.openSection = this.openSection;
         context.tabs = this._getTabs(this.constructor.TABS);
         context.config = CONFIG.DH;
diff --git a/module/applications/sheets-configs/activeEffectConfig.mjs b/module/applications/sheets-configs/activeEffectConfig.mjs
index 468aba5c..d7b1b536 100644
--- a/module/applications/sheets-configs/activeEffectConfig.mjs
+++ b/module/applications/sheets-configs/activeEffectConfig.mjs
@@ -9,6 +9,9 @@ export default class DhActiveEffectConfig extends foundry.applications.sheets.Ac
             if (!ignoredActorKeys.includes(key)) {
                 const model = game.system.api.models.actors[key];
                 const attributes = CONFIG.Token.documentClass.getTrackedAttributes(model);
+                // As per DHToken._getTrackedAttributesFromSchema, attributes.bar have a max version as well.
+                const maxAttributes = attributes.bar.map(x => [...x, 'max']);
+                attributes.value.push(...maxAttributes);
                 const group = game.i18n.localize(model.metadata.label);
                 const choices = CONFIG.Token.documentClass
                     .getTrackedAttributeChoices(attributes, model)
diff --git a/module/applications/sheets-configs/prototype-token-config.mjs b/module/applications/sheets-configs/prototype-token-config.mjs
index 24c9dabb..0bb9703a 100644
--- a/module/applications/sheets-configs/prototype-token-config.mjs
+++ b/module/applications/sheets-configs/prototype-token-config.mjs
@@ -1,4 +1,18 @@
 export default class DhPrototypeTokenConfig extends foundry.applications.sheets.PrototypeTokenConfig {
+    /** @override */
+    static PARTS = {
+        tabs: super.PARTS.tabs,
+        identity: super.PARTS.identity,
+        appearance: {
+            template: 'systems/daggerheart/templates/sheets-settings/token-config/appearance.hbs',
+            scrollable: ['']
+        },
+        vision: super.PARTS.vision,
+        light: super.PARTS.light,
+        resources: super.PARTS.resources,
+        footer: super.PARTS.footer
+    };
+
     /** @inheritDoc */
     async _prepareResourcesTab() {
         const token = this.token;
@@ -17,4 +31,11 @@ export default class DhPrototypeTokenConfig extends foundry.applications.sheets.
             turnMarkerAnimations: CONFIG.Combat.settings.turnMarkerAnimations
         };
     }
+
+    async _prepareAppearanceTab() {
+        const context = await super._prepareAppearanceTab();
+        context.actorSizeUsed = this.token.actor ? Boolean(this.token.actor.system.size) : false;
+
+        return context;
+    }
 }
diff --git a/module/applications/sheets-configs/token-config.mjs b/module/applications/sheets-configs/token-config.mjs
index ee573e5d..5f4e4f56 100644
--- a/module/applications/sheets-configs/token-config.mjs
+++ b/module/applications/sheets-configs/token-config.mjs
@@ -1,4 +1,18 @@
 export default class DhTokenConfig extends foundry.applications.sheets.TokenConfig {
+    /** @override */
+    static PARTS = {
+        tabs: super.PARTS.tabs,
+        identity: super.PARTS.identity,
+        appearance: {
+            template: 'systems/daggerheart/templates/sheets-settings/token-config/appearance.hbs',
+            scrollable: ['']
+        },
+        vision: super.PARTS.vision,
+        light: super.PARTS.light,
+        resources: super.PARTS.resources,
+        footer: super.PARTS.footer
+    };
+
     /** @inheritDoc */
     async _prepareResourcesTab() {
         const token = this.token;
@@ -17,4 +31,11 @@ export default class DhTokenConfig extends foundry.applications.sheets.TokenConf
             turnMarkerAnimations: CONFIG.Combat.settings.turnMarkerAnimations
         };
     }
+
+    async _prepareAppearanceTab() {
+        const context = await super._prepareAppearanceTab();
+        context.actorSizeUsed = this.token.actor ? Boolean(this.token.actor.system.size) : false;
+
+        return context;
+    }
 }
diff --git a/module/applications/sheets/actors/adversary.mjs b/module/applications/sheets/actors/adversary.mjs
index 6b6354ef..345f6fed 100644
--- a/module/applications/sheets/actors/adversary.mjs
+++ b/module/applications/sheets/actors/adversary.mjs
@@ -26,7 +26,7 @@ export default class AdversarySheet extends DHBaseActorSheet {
                 }
             ]
         },
-        dragDrop: [{ dragSelector: '[data-item-id][draggable="true"]', dropSelector: null }]
+        dragDrop: [{ dragSelector: '[data-item-id]', dropSelector: null }]
     };
 
     static PARTS = {
diff --git a/module/applications/sheets/actors/character.mjs b/module/applications/sheets/actors/character.mjs
index 953a0cf6..66ed6315 100644
--- a/module/applications/sheets/actors/character.mjs
+++ b/module/applications/sheets/actors/character.mjs
@@ -46,7 +46,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
         },
         dragDrop: [
             {
-                dragSelector: '[data-item-id][draggable="true"]',
+                dragSelector: '[data-item-id][draggable="true"], [data-item-id] [draggable="true"]',
                 dropSelector: null
             }
         ],
@@ -675,16 +675,21 @@ export default class CharacterSheet extends DHBaseActorSheet {
             roll: {
                 trait: button.dataset.attribute
             },
-            hasRoll: true
-        };
-        const result = await this.document.diceRoll({
-            ...config,
+            hasRoll: true,
             actionType: 'action',
             headerTitle: `${game.i18n.localize('DAGGERHEART.GENERAL.dualityRoll')}: ${this.actor.name}`,
             title: game.i18n.format('DAGGERHEART.UI.Chat.dualityRoll.abilityCheckTitle', {
                 ability: abilityLabel
             })
-        });
+        };
+        const result = await this.document.diceRoll(config);
+
+        /* This could be avoided by baking config.costs into config.resourceUpdates. Didn't feel like messing with it at the time */
+        const costResources = result.costs
+            .filter(x => x.enabled)
+            .map(cost => ({ ...cost, value: -cost.value, total: -cost.total }));
+        config.resourceUpdates.addResources(costResources);
+        await config.resourceUpdates.updateResources();
     }
 
     //TODO: redo toggleEquipItem method
@@ -863,6 +868,15 @@ export default class CharacterSheet extends DHBaseActorSheet {
         });
     }
 
+    /** @inheritdoc */
+    async _onDragStart(event) {
+        const inventoryItem = event.currentTarget.closest('.inventory-item');
+        if (inventoryItem) {
+            event.dataTransfer.setDragImage(inventoryItem.querySelector('img'), 60, 0);
+        }
+        super._onDragStart(event);
+    }
+
     async _onDropItem(event, item) {
         if (this.document.uuid === item.parent?.uuid) {
             return super._onDropItem(event, item);
diff --git a/module/applications/sheets/actors/party.mjs b/module/applications/sheets/actors/party.mjs
index 5c448b49..d78519cb 100644
--- a/module/applications/sheets/actors/party.mjs
+++ b/module/applications/sheets/actors/party.mjs
@@ -40,7 +40,7 @@ export default class Party extends DHBaseActorSheet {
             selectRefreshable: DaggerheartMenu.selectRefreshable,
             refreshActors: DaggerheartMenu.refreshActors
         },
-        dragDrop: [{ dragSelector: '[data-item-id][draggable="true"]', dropSelector: null }]
+        dragDrop: [{ dragSelector: '[data-item-id]', dropSelector: null }]
     };
 
     /**@override */
diff --git a/module/applications/sheets/api/application-mixin.mjs b/module/applications/sheets/api/application-mixin.mjs
index b11fc779..d25a1a4e 100644
--- a/module/applications/sheets/api/application-mixin.mjs
+++ b/module/applications/sheets/api/application-mixin.mjs
@@ -179,10 +179,10 @@ export default function DHApplicationMixin(Base) {
             super._attachPartListeners(partId, htmlElement, options);
             this._dragDrop.forEach(d => d.bind(htmlElement));
 
+            // Handle delta inputs
             for (const deltaInput of htmlElement.querySelectorAll('input[data-allow-delta]')) {
                 deltaInput.dataset.numValue = deltaInput.value;
                 deltaInput.inputMode = 'numeric';
-                deltaInput.pattern = '^[+=\\-]?\d*';
 
                 const handleUpdate = (delta = 0) => {
                     const min = Number(deltaInput.min) || 0;
@@ -232,6 +232,25 @@ export default function DHApplicationMixin(Base) {
                     handleUpdate();
                 });
             }
+
+            // Handle contenteditable
+            for (const input of htmlElement.querySelectorAll('[contenteditable][data-property]')) {
+                const property = input.dataset.property;
+                input.addEventListener("blur", () => {
+                    const selection = document.getSelection();
+                    if (input.contains(selection.anchorNode)) {
+                        selection.empty();
+                    }
+                    this.document.update({ [property]: input.textContent });
+                });
+
+                input.addEventListener("keydown", event => {
+                    if (event.key === "Enter") input.blur();
+                });
+
+                // Chrome sometimes add <br>, which aren't a problem for the value but are for the placeholder
+                input.addEventListener("input", () => input.querySelectorAll("br").forEach((i) => i.remove()));
+            }
         }
 
         /**@inheritdoc */
diff --git a/module/applications/sheets/api/base-actor.mjs b/module/applications/sheets/api/base-actor.mjs
index adb0d39a..85ecd616 100644
--- a/module/applications/sheets/api/base-actor.mjs
+++ b/module/applications/sheets/api/base-actor.mjs
@@ -34,7 +34,10 @@ export default class DHBaseActorSheet extends DHApplicationMixin(ActorSheetV2) {
                 }
             }
         ],
-        dragDrop: [{ dragSelector: '.inventory-item[data-type="attack"]', dropSelector: null }]
+        dragDrop: [
+            { dragSelector: '.inventory-item[data-type="attack"]', dropSelector: null },
+            { dragSelector: ".currency[data-currency] .drag-handle", dropSelector: null }
+        ]
     };
 
     /* -------------------------------------------- */
@@ -254,14 +257,35 @@ export default class DHBaseActorSheet extends DHApplicationMixin(ActorSheetV2) {
     /*  Application Drag/Drop                       */
     /* -------------------------------------------- */
 
+    async _onDrop(event) {
+        event.stopPropagation();
+        const data = foundry.applications.ux.TextEditor.implementation.getDragEventData(event);
+        if (data.type === 'Currency' && ['character', 'party'].includes(this.document.type)) {
+            const originActor = await foundry.utils.fromUuid(data.originActor);
+            if (!originActor || originActor.uuid === this.document.uuid) return;
+            const currency = data.currency;
+            const quantity = await game.system.api.applications.dialogs.ItemTransferDialog.configure({
+                originActor,
+                targetActor: this.document,
+                currency
+            });
+            if (quantity) {
+                originActor.update({ [`system.gold.${currency}`]: Math.max(0, originActor.system.gold[currency] - quantity) });
+                this.document.update({ [`system.gold.${currency}`]: this.document.system.gold[currency] + quantity });
+            }
+            return;
+        }
+
+        return super._onDrop(event);
+    }
+
     async _onDropItem(event, item) {
         const data = foundry.applications.ux.TextEditor.implementation.getDragEventData(event);
-        const physicalActorTypes = ['character', 'party'];
         const originActor = item.actor;
         if (
             item.actor?.uuid === this.document.uuid ||
             !originActor ||
-            !physicalActorTypes.includes(this.document.type)
+            !['character', 'party'].includes(this.document.type)
         ) {
             return super._onDropItem(event, item);
         }
@@ -270,10 +294,10 @@ export default class DHBaseActorSheet extends DHApplicationMixin(ActorSheetV2) {
         if (item.system.metadata.isInventoryItem) {
             if (item.system.metadata.isQuantifiable) {
                 const actorItem = originActor.items.get(data.originId);
-                const quantityTransfered =
-                    actorItem.system.quantity === 1
-                        ? 1
-                        : await game.system.api.applications.dialogs.ItemTransferDialog.configure(item);
+                const quantityTransfered = await game.system.api.applications.dialogs.ItemTransferDialog.configure({
+                    item,
+                    targetActor: this.document
+                });
 
                 if (quantityTransfered) {
                     if (quantityTransfered === actorItem.system.quantity) {
@@ -314,6 +338,16 @@ export default class DHBaseActorSheet extends DHApplicationMixin(ActorSheetV2) {
      * @param {DragEvent} event - The drag event
      */
     async _onDragStart(event) {
+        // Handle drag/dropping currencies
+        const currencyEl = event.currentTarget.closest(".currency[data-currency]");
+        if (currencyEl) {
+            const currency = currencyEl.dataset.currency;
+            const data = { type: 'Currency', currency, originActor: this.document.uuid };
+            event.dataTransfer.setData('text/plain', JSON.stringify(data));
+            return;
+        }
+
+        // Handle drag/dropping attacks
         const attackItem = event.currentTarget.closest('.inventory-item[data-type="attack"]');
         if (attackItem) {
             const attackData = {
diff --git a/module/applications/sheets/items/beastform.mjs b/module/applications/sheets/items/beastform.mjs
index 1c4a4880..880c0796 100644
--- a/module/applications/sheets/items/beastform.mjs
+++ b/module/applications/sheets/items/beastform.mjs
@@ -77,6 +77,7 @@ export default class BeastformSheet extends DHBaseItemSheet {
                         name: context.document.system.advantageOn[key].value
                     }))
                 );
+                context.dimensionsDisabled = context.document.system.tokenSize.size !== 'custom';
                 break;
             case 'effects':
                 context.effects.actives = context.effects.actives.map(effect => {
diff --git a/module/applications/sheets/items/feature.mjs b/module/applications/sheets/items/feature.mjs
index 1575067b..6ff98ca7 100644
--- a/module/applications/sheets/items/feature.mjs
+++ b/module/applications/sheets/items/feature.mjs
@@ -31,4 +31,11 @@ export default class FeatureSheet extends DHBaseItemSheet {
             labelPrefix: 'DAGGERHEART.GENERAL.Tabs'
         }
     };
+//Might be wrong location but testing out if here is okay.
+    /**@override */
+    async _prepareContext(options) {
+        const context = await super._prepareContext(options);
+        context.featureFormChoices = CONFIG.DH.ITEM.featureForm;
+        return context;
+    }
 }
diff --git a/module/applications/sidebar/tabs/actorDirectory.mjs b/module/applications/sidebar/tabs/actorDirectory.mjs
index 4a528e74..d40443a0 100644
--- a/module/applications/sidebar/tabs/actorDirectory.mjs
+++ b/module/applications/sidebar/tabs/actorDirectory.mjs
@@ -17,4 +17,30 @@ export default class DhActorDirectory extends foundry.applications.sidebar.tabs.
                   : null;
         };
     }
+
+    /** @inheritDoc */
+    _onDragStart(event) {
+        let actor;
+        const { entryId } = event.currentTarget.dataset;
+        if (entryId) {
+            actor = this.collection.get(entryId);
+            if (!actor?.visible) return false;
+        }
+        super._onDragStart(event);
+
+        // Create the drag preview.
+        if (actor && canvas.ready) {
+            const img = event.currentTarget.querySelector('img');
+            const pt = actor.prototypeToken;
+            const usesSize = actor.system.metadata.usesSize;
+            const tokenSizes = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).tokenSizes;
+            const width = usesSize ? tokenSizes[actor.system.size] : pt.width;
+            const height = usesSize ? tokenSizes[actor.system.size] : pt.height;
+
+            const w = width * canvas.dimensions.size * Math.abs(pt.texture.scaleX) * canvas.stage.scale.x;
+            const h = height * canvas.dimensions.size * Math.abs(pt.texture.scaleY) * canvas.stage.scale.y;
+            const preview = foundry.applications.ux.DragDrop.implementation.createDragImage(img, w, h);
+            event.dataTransfer.setDragImage(preview, w / 2, h / 2);
+        }
+    }
 }
diff --git a/module/applications/ui/chatLog.mjs b/module/applications/ui/chatLog.mjs
index 47dfe500..45d9c0b3 100644
--- a/module/applications/ui/chatLog.mjs
+++ b/module/applications/ui/chatLog.mjs
@@ -55,27 +55,28 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
         ];
     }
 
-    addChatListeners = async (app, html, data) => {
+    addChatListeners = async (document, html, data) => {
+        const message = data?.message ?? document.toObject(false);
         html.querySelectorAll('.simple-roll-button').forEach(element =>
-            element.addEventListener('click', event => this.onRollSimple(event, data.message))
+            element.addEventListener('click', event => this.onRollSimple(event, message))
         );
         html.querySelectorAll('.ability-use-button').forEach(element =>
-            element.addEventListener('click', event => this.abilityUseButton(event, data.message))
+            element.addEventListener('click', event => this.abilityUseButton(event, message))
         );
         html.querySelectorAll('.action-use-button').forEach(element =>
-            element.addEventListener('click', event => this.actionUseButton(event, data.message))
+            element.addEventListener('click', event => this.actionUseButton(event, message))
         );
         html.querySelectorAll('.reroll-button').forEach(element =>
-            element.addEventListener('click', event => this.rerollEvent(event, data.message))
+            element.addEventListener('click', event => this.rerollEvent(event, message))
         );
         html.querySelectorAll('.group-roll-button').forEach(element =>
-            element.addEventListener('click', event => this.groupRollButton(event, data.message))
+            element.addEventListener('click', event => this.groupRollButton(event, message))
         );
         html.querySelectorAll('.group-roll-reroll').forEach(element =>
-            element.addEventListener('click', event => this.groupRollReroll(event, data.message))
+            element.addEventListener('click', event => this.groupRollReroll(event, message))
         );
         html.querySelectorAll('.group-roll-success').forEach(element =>
-            element.addEventListener('click', event => this.groupRollSuccessEvent(event, data.message))
+            element.addEventListener('click', event => this.groupRollSuccessEvent(event, message))
         );
         html.querySelectorAll('.group-roll-header-expand-section').forEach(element =>
             element.addEventListener('click', this.groupRollExpandSection)
diff --git a/module/applications/ui/combatTracker.mjs b/module/applications/ui/combatTracker.mjs
index 2ed0e52b..babc4a65 100644
--- a/module/applications/ui/combatTracker.mjs
+++ b/module/applications/ui/combatTracker.mjs
@@ -5,8 +5,7 @@ export default class DhCombatTracker extends foundry.applications.sidebar.tabs.C
         actions: {
             requestSpotlight: this.requestSpotlight,
             toggleSpotlight: this.toggleSpotlight,
-            setActionTokens: this.setActionTokens,
-            openCountdowns: this.openCountdowns
+            setActionTokens: this.setActionTokens
         }
     };
 
@@ -57,7 +56,10 @@ export default class DhCombatTracker extends foundry.applications.sidebar.tabs.C
 
         const adversaries = context.turns?.filter(x => x.isNPC) ?? [];
         const characters = context.turns?.filter(x => !x.isNPC) ?? [];
-        const spotlightQueueEnabled = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.SpotlightRequestQueue);
+        const spotlightQueueEnabled = game.settings.get(
+            CONFIG.DH.id,
+            CONFIG.DH.SETTINGS.gameSettings.SpotlightRequestQueue
+        );
 
         const spotlightRequests = characters
             ?.filter(x => !x.isNPC && spotlightQueueEnabled)
@@ -71,7 +73,9 @@ export default class DhCombatTracker extends foundry.applications.sidebar.tabs.C
         Object.assign(context, {
             actionTokens: game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.variantRules).actionTokens,
             adversaries,
-            characters: characters?.filter(x => !x.isNPC).filter(x => !spotlightQueueEnabled || x.system.spotlight.requestOrderIndex == 0),
+            characters: characters
+                ?.filter(x => !x.isNPC)
+                .filter(x => !spotlightQueueEnabled || x.system.spotlight.requestOrderIndex == 0),
             spotlightRequests
         });
     }
@@ -162,8 +166,10 @@ export default class DhCombatTracker extends foundry.applications.sidebar.tabs.C
         if (this.viewed.turn !== toggleTurn) {
             const { updateCountdowns } = game.system.api.applications.ui.DhCountdowns;
             if (combatant.actor.type === 'character') {
-                await updateCountdowns(CONFIG.DH.GENERAL.countdownProgressionTypes.spotlight.id,
-                    CONFIG.DH.GENERAL.countdownProgressionTypes.characterSpotlight.id);
+                await updateCountdowns(
+                    CONFIG.DH.GENERAL.countdownProgressionTypes.spotlight.id,
+                    CONFIG.DH.GENERAL.countdownProgressionTypes.characterSpotlight.id
+                );
             } else {
                 await updateCountdowns(CONFIG.DH.GENERAL.countdownProgressionTypes.spotlight.id);
             }
diff --git a/module/config/actorConfig.mjs b/module/config/actorConfig.mjs
index 7ff42754..fdef7d03 100644
--- a/module/config/actorConfig.mjs
+++ b/module/config/actorConfig.mjs
@@ -211,6 +211,44 @@ export const adversaryTraits = {
     }
 };
 
+export const tokenSize = {
+    custom: {
+        id: 'custom',
+        value: 0,
+        label: 'DAGGERHEART.GENERAL.custom'
+    },
+    tiny: {
+        id: 'tiny',
+        value: 1,
+        label: 'DAGGERHEART.CONFIG.TokenSize.tiny'
+    },
+    small: {
+        id: 'small',
+        value: 2,
+        label: 'DAGGERHEART.CONFIG.TokenSize.small'
+    },
+    medium: {
+        id: 'medium',
+        value: 3,
+        label: 'DAGGERHEART.CONFIG.TokenSize.medium'
+    },
+    large: {
+        id: 'large',
+        value: 4,
+        label: 'DAGGERHEART.CONFIG.TokenSize.large'
+    },
+    huge: {
+        id: 'huge',
+        value: 5,
+        label: 'DAGGERHEART.CONFIG.TokenSize.huge'
+    },
+    gargantuan: {
+        id: 'gargantuan',
+        value: 6,
+        label: 'DAGGERHEART.CONFIG.TokenSize.gargantuan'
+    }
+};
+
 export const levelChoices = {
     attributes: {
         name: 'attributes',
diff --git a/module/config/encounterConfig.mjs b/module/config/encounterConfig.mjs
index 0269b5c1..7565652f 100644
--- a/module/config/encounterConfig.mjs
+++ b/module/config/encounterConfig.mjs
@@ -84,6 +84,7 @@ export const BPModifiers = {
         increaseDamage: {
             sort: 2,
             description: 'DAGGERHEART.CONFIG.BPModifiers.increaseDamage.description',
+            effectTargetTypes: ['adversary'],
             effects: [
                 {
                     name: 'DAGGERHEART.CONFIG.BPModifiers.increaseDamage.effect.name',
diff --git a/module/config/itemConfig.mjs b/module/config/itemConfig.mjs
index a9ad1d68..02914143 100644
--- a/module/config/itemConfig.mjs
+++ b/module/config/itemConfig.mjs
@@ -5,7 +5,6 @@ export const armorFeatures = {
         actions: [
             {
                 type: 'damage',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.ArmorFeature.burning.actions.burn.name',
                 description: 'DAGGERHEART.CONFIG.ArmorFeature.burning.actions.burn.description',
@@ -174,7 +173,6 @@ export const armorFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.ArmorFeature.hopeful.actions.hope.name',
                 description: 'DAGGERHEART.CONFIG.ArmorFeature.hopeful.actions.hope.description',
@@ -188,7 +186,6 @@ export const armorFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.ArmorFeature.impenetrable.actions.impenetrable.name',
                 description: 'DAGGERHEART.CONFIG.ArmorFeature.impenetrable.actions.impenetrable.description',
@@ -231,7 +228,6 @@ export const armorFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.ArmorFeature.painful.actions.pain.name',
                 description: 'DAGGERHEART.CONFIG.ArmorFeature.painful.actions.pain.description',
@@ -269,7 +265,6 @@ export const armorFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.ArmorFeature.quiet.actions.quiet.name',
                 description: 'DAGGERHEART.CONFIG.ArmorFeature.quiet.actions.quiet.description',
@@ -306,7 +301,6 @@ export const armorFeatures = {
         actions: [
             {
                 type: 'attack',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.ArmorFeature.resilient.actions.resilient.name',
                 description: 'DAGGERHEART.CONFIG.ArmorFeature.resilient.actions.resilient.description',
@@ -353,7 +347,6 @@ export const armorFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.ArmorFeature.shifting.actions.shift.name',
                 description: 'DAGGERHEART.CONFIG.ArmorFeature.shifting.actions.shift.description',
@@ -373,7 +366,6 @@ export const armorFeatures = {
         actions: [
             {
                 type: 'attack',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.ArmorFeature.timeslowing.actions.slowTime.name',
                 description: 'DAGGERHEART.CONFIG.ArmorFeature.timeslowing.actions.slowTime.description',
@@ -401,7 +393,6 @@ export const armorFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.ArmorFeature.truthseeking.actions.truthseeking.name',
                 description: 'DAGGERHEART.CONFIG.ArmorFeature.truthseeking.actions.truthseeking.description',
@@ -537,7 +528,6 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.bouncing.actions.bounce.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.bouncing.actions.bounce.description',
@@ -582,7 +572,6 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.brutal.actions.addDamage.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.brutal.actions.addDamage.description',
@@ -596,7 +585,6 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.burning.actions.burn.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.burning.actions.burn.description',
@@ -610,7 +598,6 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.charged.actions.markStress.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.charged.actions.markStress.description',
@@ -647,7 +634,6 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.concussive.actions.attack.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.concussive.actions.attack.description',
@@ -688,7 +674,6 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.deadly.actions.extraDamage.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.deadly.actions.extraDamage.description',
@@ -702,7 +687,6 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.deflecting.actions.deflect.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.deflecting.actions.deflect.description',
@@ -739,7 +723,6 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'damage',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.destructive.actions.attack.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.destructive.actions.attack.descriptive',
@@ -784,7 +767,6 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.devastating.actions.devastate.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.devastating.actions.devastate.description',
@@ -835,7 +817,6 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.doubledUp.actions.doubleUp.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.doubledUp.actions.doubleUp.description',
@@ -849,7 +830,6 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.dueling.actions.duel.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.dueling.actions.duel.description',
@@ -863,7 +843,6 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect', // Should prompt a dc 14 reaction save on adversaries
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.eruptive.actions.erupt.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.eruptive.actions.erupt.description',
@@ -877,7 +856,6 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.grappling.actions.grapple.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.grappling.actions.grapple.description',
@@ -897,7 +875,6 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.greedy.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.greedy.description',
@@ -929,7 +906,6 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'healing',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.healing.actions.heal.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.healing.actions.heal.description',
@@ -977,7 +953,6 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.hooked.actions.hook.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.hooked.actions.hook.description',
@@ -991,7 +966,6 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.hot.actions.hot.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.hot.actions.hot.description',
@@ -1005,7 +979,6 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.invigorating.actions.invigorate.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.invigorating.actions.invigorate.description',
@@ -1019,7 +992,6 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.lifestealing.actions.lifesteal.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.lifestealing.actions.lifesteal.description',
@@ -1033,7 +1005,6 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.lockedOn.actions.lockOn.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.lockedOn.actions.lockOn.description',
@@ -1047,7 +1018,6 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.long.actions.long.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.long.actions.long.description',
@@ -1061,7 +1031,6 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.lucky.actions.luck.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.lucky.actions.luck.description',
@@ -1099,7 +1068,6 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.painful.actions.pain.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.painful.actions.pain.description',
@@ -1145,7 +1113,6 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.parry.actions.parry.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.parry.actions.parry.description',
@@ -1159,7 +1126,6 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.persuasive.actions.persuade.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.persuasive.actions.persuade.description',
@@ -1196,7 +1162,6 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.pompous.actions.pompous.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.pompous.actions.pompous.description',
@@ -1240,7 +1205,6 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.quick.actions.quick.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.quick.actions.quick.description',
@@ -1278,7 +1242,6 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.reloading.actions.reload.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.reloading.actions.reload.description',
@@ -1292,7 +1255,6 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.retractable.actions.retract.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.retractable.actions.retract.description',
@@ -1306,7 +1268,6 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.returning.actions.return.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.returning.actions.return.description',
@@ -1320,7 +1281,6 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.scary.actions.scare.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.scary.actions.scare.description',
@@ -1376,7 +1336,6 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.sheltering.actions.shelter.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.sheltering.actions.shelter.description',
@@ -1390,7 +1349,6 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.startling.actions.startle.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.startling.actions.startle.description',
@@ -1410,7 +1368,6 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
-                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.timebending.actions.bendTime.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.timebending.actions.bendTime.description',
@@ -1458,6 +1415,12 @@ export const orderedWeaponFeatures = () => {
     return Object.values(all).sort((a, b) => game.i18n.localize(a.label).localeCompare(game.i18n.localize(b.label)));
 };
 
+export const featureForm = {
+    passive: "DAGGERHEART.CONFIG.FeatureForm.passive",
+    action: "DAGGERHEART.CONFIG.FeatureForm.action",
+    reaction: "DAGGERHEART.CONFIG.FeatureForm.reaction"
+};
+
 export const featureTypes = {
     ancestry: {
         id: 'ancestry',
@@ -1515,21 +1478,6 @@ export const featureSubTypes = {
     mastery: 'mastery'
 };
 
-export const actionTypes = {
-    passive: {
-        id: 'passive',
-        label: 'DAGGERHEART.CONFIG.ActionType.passive'
-    },
-    action: {
-        id: 'action',
-        label: 'DAGGERHEART.CONFIG.ActionType.action'
-    },
-    reaction: {
-        id: 'reaction',
-        label: 'DAGGERHEART.CONFIG.ActionType.reaction'
-    }
-};
-
 export const itemResourceTypes = {
     simple: {
         id: 'simple',
diff --git a/module/data/action/baseAction.mjs b/module/data/action/baseAction.mjs
index 93de0a2d..239bfa1e 100644
--- a/module/data/action/baseAction.mjs
+++ b/module/data/action/baseAction.mjs
@@ -95,6 +95,9 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
     prepareData() {
         this.name = this.name || game.i18n.localize(CONFIG.DH.ACTIONS.actionTypes[this.type].name);
         this.img = this.img ?? this.parent?.parent?.img;
+
+        /* Fallback to feature description */
+        this.description = this.description || this.parent?.description;
     }
 
     /**
@@ -193,8 +196,6 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
     async use(event) {
         if (!this.actor) throw new Error("An Action can't be used outside of an Actor context.");
 
-        if (this.chatDisplay) await this.toChat();
-
         let config = this.prepareConfig(event);
         if (!config) return;
 
@@ -208,9 +209,12 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
 
         // Execute the Action Worflow in order based of schema fields
         await this.executeWorkflow(config);
+        await config.resourceUpdates.updateResources();
 
         if (Hooks.call(`${CONFIG.DH.id}.postUseAction`, this, config) === false) return;
 
+        if (this.chatDisplay) await this.toChat();
+
         return config;
     }
 
@@ -239,8 +243,10 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
             isDirect: !!this.damage?.direct,
             selectedRollMode: game.settings.get('core', 'rollMode'),
             data: this.getRollData(),
-            evaluate: this.hasRoll
+            evaluate: this.hasRoll,
+            resourceUpdates: new ResourceUpdateMap(this.actor)
         };
+
         DHBaseAction.applyKeybindings(config);
         return config;
     }
@@ -322,11 +328,46 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
      * @returns {string[]} An array of localized tag strings.
      */
     _getTags() {
-        const tags = [
-            game.i18n.localize(`DAGGERHEART.ACTIONS.TYPES.${this.type}.name`),
-            game.i18n.localize(`DAGGERHEART.CONFIG.ActionType.${this.actionType}`)
-        ];
+        const tags = [game.i18n.localize(`DAGGERHEART.ACTIONS.TYPES.${this.type}.name`)];
 
         return tags;
     }
 }
+
+export class ResourceUpdateMap extends Map {
+    #actor;
+
+    constructor(actor) {
+        super();
+
+        this.#actor = actor;
+    }
+
+    addResources(resources) {
+        for (const resource of resources) {
+            if (!resource.key) continue;
+
+            const existing = this.get(resource.key);
+            if (existing) {
+                this.set(resource.key, {
+                    ...existing,
+                    value: existing.value + (resource.value ?? 0),
+                    total: existing.total + (resource.total ?? 0)
+                });
+            } else {
+                this.set(resource.key, resource);
+            }
+        }
+    }
+
+    #getResources() {
+        return Array.from(this.values());
+    }
+
+    async updateResources() {
+        if (this.#actor) {
+            const target = this.#actor.system.partner ?? this.#actor;
+            await target.modifyResource(this.#getResources());
+        }
+    }
+}
diff --git a/module/data/activeEffect/beastformEffect.mjs b/module/data/activeEffect/beastformEffect.mjs
index b5e775fc..b041b59e 100644
--- a/module/data/activeEffect/beastformEffect.mjs
+++ b/module/data/activeEffect/beastformEffect.mjs
@@ -65,20 +65,30 @@ export default class BeastformEffect extends BaseEffect {
                 }
             };
 
-            const updateToken = token => ({
-                ...baseUpdate,
-                'texture': {
-                    enabled: this.characterTokenData.usesDynamicToken,
-                    src: token.flags.daggerheart?.beastformTokenImg ?? this.characterTokenData.tokenImg
-                },
-                'ring': {
-                    subject: {
-                        texture:
-                            token.flags.daggerheart?.beastformSubjectTexture ?? this.characterTokenData.tokenRingImg
-                    }
-                },
-                'flags.daggerheart': { '-=beastformTokenImg': null, '-=beastformSubjectTexture': null }
-            });
+            const updateToken = token => {
+                const { x, y } = game.system.api.documents.DhToken.getSnappedPositionInSquareGrid(
+                    token.object.scene.grid,
+                    { x: token.x, y: token.y, elevation: token.elevation },
+                    baseUpdate.width,
+                    baseUpdate.height
+                );
+                return {
+                    ...baseUpdate,
+                    x,
+                    y,
+                    'texture': {
+                        enabled: this.characterTokenData.usesDynamicToken,
+                        src: token.flags.daggerheart?.beastformTokenImg ?? this.characterTokenData.tokenImg
+                    },
+                    'ring': {
+                        subject: {
+                            texture:
+                                token.flags.daggerheart?.beastformSubjectTexture ?? this.characterTokenData.tokenRingImg
+                        }
+                    },
+                    'flags.daggerheart': { '-=beastformTokenImg': null, '-=beastformSubjectTexture': null }
+                };
+            };
 
             await updateActorTokens(this.parent.parent, update, updateToken);
 
diff --git a/module/data/actor/adversary.mjs b/module/data/actor/adversary.mjs
index bb8df3ee..32f5c979 100644
--- a/module/data/actor/adversary.mjs
+++ b/module/data/actor/adversary.mjs
@@ -11,7 +11,8 @@ export default class DhpAdversary extends BaseDataActor {
             label: 'TYPES.Actor.adversary',
             type: 'adversary',
             settingSheet: DHAdversarySettings,
-            hasAttribution: true
+            hasAttribution: true,
+            usesSize: true
         });
     }
 
@@ -59,15 +60,13 @@ export default class DhpAdversary extends BaseDataActor {
                     0,
                     0,
                     'DAGGERHEART.GENERAL.HitPoints.plural',
-                    true,
-                    game.i18n.localize('DAGGERHEART.GENERAL.max')
+                    true
                 ),
                 stress: resourceField(
                     0,
                     0,
                     'DAGGERHEART.GENERAL.stress',
-                    true,
-                    game.i18n.localize('DAGGERHEART.GENERAL.max')
+                    true
                 )
             }),
             rules: new fields.SchemaField({
@@ -142,7 +141,7 @@ export default class DhpAdversary extends BaseDataActor {
     }
 
     isItemValid(source) {
-        return source.type === "feature";
+        return source.type === 'feature';
     }
 
     async _preUpdate(changes, options, user) {
diff --git a/module/data/actor/base.mjs b/module/data/actor/base.mjs
index c7f7ee75..29b0af28 100644
--- a/module/data/actor/base.mjs
+++ b/module/data/actor/base.mjs
@@ -1,4 +1,5 @@
 import DHBaseActorSettings from '../../applications/sheets/api/actor-setting.mjs';
+import DHItem from '../../documents/item.mjs';
 import { getScrollTextData } from '../../helpers/utils.mjs';
 
 const resistanceField = (resistanceLabel, immunityLabel, reductionLabel) =>
@@ -41,7 +42,8 @@ export default class BaseDataActor extends foundry.abstract.TypeDataModel {
             settingSheet: null,
             hasResistances: true,
             hasAttribution: false,
-            hasLimitedView: true
+            hasLimitedView: true,
+            usesSize: false
         };
     }
 
@@ -76,6 +78,13 @@ export default class BaseDataActor extends foundry.abstract.TypeDataModel {
                     'DAGGERHEART.GENERAL.DamageResistance.magicalReduction'
                 )
             });
+        if (this.metadata.usesSize)
+            schema.size = new fields.StringField({
+                required: true,
+                nullable: false,
+                choices: CONFIG.DH.ACTOR.tokenSize,
+                initial: CONFIG.DH.ACTOR.tokenSize.custom.id
+            });
         return schema;
     }
 
@@ -106,6 +115,17 @@ export default class BaseDataActor extends foundry.abstract.TypeDataModel {
         return data;
     }
 
+    /**
+     * Checks if an item is available for use, such as multiclass features being disabled
+     * on a character.
+     *
+     * @param {DHItem} item The item being checked for availability
+     * @return {boolean} whether the item is available
+     */
+    isItemAvailable(item) {
+        return true;
+    }
+
     async _preDelete() {
         /* Clear all partyMembers from tagTeam setting.*/
         /* Revisit this when tagTeam is improved for many parties */
diff --git a/module/data/actor/character.mjs b/module/data/actor/character.mjs
index c5ab914c..5bce5c55 100644
--- a/module/data/actor/character.mjs
+++ b/module/data/actor/character.mjs
@@ -435,6 +435,34 @@ export default class DhCharacter extends BaseDataActor {
         return attack;
     }
 
+    /** @inheritDoc */
+    isItemAvailable(item) {
+        if (!super.isItemAvailable(this)) return false;
+        /**
+         * Preventing subclass features from being available if the chacaracter does not
+         * have the right subclass advancement
+         */
+        if (item.system.originItemType !== CONFIG.DH.ITEM.featureTypes.subclass.id) {
+            return true;
+        }
+        if (!this.class.subclass) return false;
+
+        const prop = item.system.multiclassOrigin ? 'multiclass' : 'class';
+        const subclassState = this[prop].subclass?.system?.featureState;
+        if (!subclassState) return false;
+
+        if (
+            item.system.identifier === CONFIG.DH.ITEM.featureSubTypes.foundation ||
+            (item.system.identifier === CONFIG.DH.ITEM.featureSubTypes.specialization &&
+                subclassState >= 2) ||
+            (item.system.identifier === CONFIG.DH.ITEM.featureSubTypes.mastery && subclassState >= 3)
+        ) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
     get sheetLists() {
         const ancestryFeatures = [],
             communityFeatures = [],
@@ -443,7 +471,7 @@ export default class DhCharacter extends BaseDataActor {
             companionFeatures = [],
             features = [];
 
-        for (let item of this.parent.items) {
+        for (let item of this.parent.items.filter(x => this.isItemAvailable(x))) {
             if (item.system.originItemType === CONFIG.DH.ITEM.featureTypes.ancestry.id) {
                 ancestryFeatures.push(item);
             } else if (item.system.originItemType === CONFIG.DH.ITEM.featureTypes.community.id) {
@@ -451,20 +479,7 @@ export default class DhCharacter extends BaseDataActor {
             } else if (item.system.originItemType === CONFIG.DH.ITEM.featureTypes.class.id) {
                 classFeatures.push(item);
             } else if (item.system.originItemType === CONFIG.DH.ITEM.featureTypes.subclass.id) {
-                if (this.class.subclass) {
-                    const prop = item.system.multiclassOrigin ? 'multiclass' : 'class';
-                    const subclassState = this[prop].subclass?.system?.featureState;
-                    if (!subclassState) continue;
-
-                    if (
-                        item.system.identifier === CONFIG.DH.ITEM.featureSubTypes.foundation ||
-                        (item.system.identifier === CONFIG.DH.ITEM.featureSubTypes.specialization &&
-                            subclassState >= 2) ||
-                        (item.system.identifier === CONFIG.DH.ITEM.featureSubTypes.mastery && subclassState >= 3)
-                    ) {
-                        subclassFeatures.push(item);
-                    }
-                }
+                subclassFeatures.push(item);
             } else if (item.system.originItemType === CONFIG.DH.ITEM.featureTypes.companion.id) {
                 companionFeatures.push(item);
             } else if (item.type === 'feature' && !item.system.type) {
diff --git a/module/data/actor/party.mjs b/module/data/actor/party.mjs
index b306c486..236d65db 100644
--- a/module/data/actor/party.mjs
+++ b/module/data/actor/party.mjs
@@ -26,7 +26,7 @@ export default class DhParty extends BaseDataActor {
     /* -------------------------------------------- */
 
     isItemValid(source) {
-        return ["weapon", "armor", "consumable", "loot"].includes(source.type);
+        return ['weapon', 'armor', 'consumable', 'loot'].includes(source.type);
     }
 
     prepareBaseData() {
diff --git a/module/data/fields/action/beastformField.mjs b/module/data/fields/action/beastformField.mjs
index 6ec5fdac..6185f0f8 100644
--- a/module/data/fields/action/beastformField.mjs
+++ b/module/data/fields/action/beastformField.mjs
@@ -92,6 +92,18 @@ export default class BeastformField extends fields.SchemaField {
 
             beastformEffect.changes = [...beastformEffect.changes, ...evolvedForm.changes];
             formData.system.features = [...formData.system.features, ...selectedForm.system.features.map(x => x.uuid)];
+
+            const baseSize = evolvedData.form.system.tokenSize.size;
+            const evolvedSize =
+                baseSize === 'custom'
+                    ? 'custom'
+                    : (Object.keys(CONFIG.DH.ACTOR.tokenSize).find(
+                          x => CONFIG.DH.ACTOR.tokenSize[x].value === CONFIG.DH.ACTOR.tokenSize[baseSize].value + 1
+                      ) ?? baseSize);
+            formData.system.tokenSize = {
+                ...evolvedData.form.system.tokenSize,
+                size: evolvedSize
+            };
         }
 
         if (selectedForm.system.beastformType === CONFIG.DH.ITEM.beastformTypes.hybrid.id) {
diff --git a/module/data/fields/action/costField.mjs b/module/data/fields/action/costField.mjs
index 656edee3..9271f6b0 100644
--- a/module/data/fields/action/costField.mjs
+++ b/module/data/fields/action/costField.mjs
@@ -75,7 +75,7 @@ export default class CostField extends fields.ArrayField {
                 }
             }, []);
 
-        await actor.modifyResource(resources);
+        config.resourceUpdates.addResources(resources);
     }
 
     /**
diff --git a/module/data/fields/action/saveField.mjs b/module/data/fields/action/saveField.mjs
index 473286b1..c9030036 100644
--- a/module/data/fields/action/saveField.mjs
+++ b/module/data/fields/action/saveField.mjs
@@ -124,29 +124,21 @@ export default class SaveField extends fields.SchemaField {
      */
     static async updateSaveMessage(result, message, targetId) {
         if (!result) return;
-        const updateMsg = async function (message, targetId, result) {
-            // setTimeout(async () => {
-            const chatMessage = ui.chat.collection.get(message._id),
-                changes = {
-                    flags: {
-                        [game.system.id]: {
-                            reactionRolls: {
-                                [targetId]: {
-                                    result: result.roll.total,
-                                    success: result.roll.success
-                                }
+
+        const chatMessage = ui.chat.collection.get(message._id),
+            changes = {
+                flags: {
+                    [game.system.id]: {
+                        reactionRolls: {
+                            [targetId]: {
+                                result: result.roll.total,
+                                success: result.roll.success
                             }
                         }
                     }
-                };
-            await chatMessage.update(changes);
-            // }, 100);
-        };
-        if (game.modules.get('dice-so-nice')?.active)
-            game.dice3d
-                .waitFor3DAnimationByMessageID(result.message.id ?? result.message._id)
-                .then(async () => await updateMsg(message, targetId, result));
-        else await updateMsg(message, targetId, result);
+                }
+            };
+        await chatMessage.update(changes);
     }
 
     /**
diff --git a/module/data/fields/action/targetField.mjs b/module/data/fields/action/targetField.mjs
index 41383fea..73766118 100644
--- a/module/data/fields/action/targetField.mjs
+++ b/module/data/fields/action/targetField.mjs
@@ -79,7 +79,7 @@ export default class TargetField extends fields.SchemaField {
         return {
             id: token.id,
             actorId: token.actor.uuid,
-            name: token.actor.name,
+            name: token.name,
             img: token.actor.img,
             difficulty: token.actor.system.difficulty,
             evasion: token.actor.system.evasion,
diff --git a/module/data/fields/actionField.mjs b/module/data/fields/actionField.mjs
index 8661f500..6257da38 100644
--- a/module/data/fields/actionField.mjs
+++ b/module/data/fields/actionField.mjs
@@ -141,6 +141,12 @@ export function ActionMixin(Base) {
             return this.documentName;
         }
 
+        //Getter for icons
+        get typeIcon() {
+            const config = CONFIG.DH.ACTIONS.actionTypes[this.type];
+            return config?.icon || 'fa-question'; // Fallback icon just in case
+        }
+
         get relativeUUID() {
             return `.Item.${this.item.id}.Action.${this.id}`;
         }
@@ -256,7 +262,7 @@ export function ActionMixin(Base) {
         async toChat(origin) {
             const cls = getDocumentClass('ChatMessage');
             const systemData = {
-                title: game.i18n.localize('DAGGERHEART.CONFIG.ActionType.action'),
+                title: game.i18n.localize('DAGGERHEART.CONFIG.FeatureForm.action'),
                 origin: origin,
                 action: {
                     name: this.name,
diff --git a/module/data/item/beastform.mjs b/module/data/item/beastform.mjs
index 51ca298d..669cd4b1 100644
--- a/module/data/item/beastform.mjs
+++ b/module/data/item/beastform.mjs
@@ -43,6 +43,12 @@ export default class DHBeastform extends BaseDataItem {
                 base64: false
             }),
             tokenSize: new fields.SchemaField({
+                size: new fields.StringField({
+                    required: true,
+                    nullable: false,
+                    choices: CONFIG.DH.ACTOR.tokenSize,
+                    initial: CONFIG.DH.ACTOR.tokenSize.custom.id
+                }),
                 height: new fields.NumberField({ integer: true, min: 1, initial: null, nullable: true }),
                 width: new fields.NumberField({ integer: true, min: 1, initial: null, nullable: true })
             }),
@@ -190,9 +196,18 @@ export default class DHBeastform extends BaseDataItem {
 
         await this.parent.parent.createEmbeddedDocuments('ActiveEffect', [beastformEffect.toObject()]);
 
+        const autoTokenSize =
+            this.tokenSize.size !== 'custom'
+                ? game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).tokenSizes[
+                      this.tokenSize.size
+                  ]
+                : null;
+        const width = autoTokenSize ?? this.tokenSize.width;
+        const height = autoTokenSize ?? this.tokenSize.height;
+
         const prototypeTokenUpdate = {
-            height: this.tokenSize.height,
-            width: this.tokenSize.width,
+            height,
+            width,
             texture: {
                 src: this.tokenImg
             },
@@ -202,16 +217,25 @@ export default class DHBeastform extends BaseDataItem {
                 }
             }
         };
-
-        const tokenUpdate = token => ({
-            ...prototypeTokenUpdate,
-            flags: {
-                daggerheart: {
-                    beastformTokenImg: token.texture.src,
-                    beastformSubjectTexture: token.ring.subject.texture
+        const tokenUpdate = token => {
+            const { x, y } = game.system.api.documents.DhToken.getSnappedPositionInSquareGrid(
+                token.object.scene.grid,
+                { x: token.x, y: token.y, elevation: token.elevation },
+                width ?? token.width,
+                height ?? token.height
+            );
+            return {
+                ...prototypeTokenUpdate,
+                x,
+                y,
+                flags: {
+                    daggerheart: {
+                        beastformTokenImg: token.texture.src,
+                        beastformSubjectTexture: token.ring.subject.texture
+                    }
                 }
-            }
-        });
+            };
+        };
 
         await updateActorTokens(this.parent.parent, prototypeTokenUpdate, tokenUpdate);
 
diff --git a/module/data/item/feature.mjs b/module/data/item/feature.mjs
index 3b8fe064..cb01b1fb 100644
--- a/module/data/item/feature.mjs
+++ b/module/data/item/feature.mjs
@@ -30,7 +30,13 @@ export default class DHFeature extends BaseDataItem {
                 initial: null
             }),
             multiclassOrigin: new fields.BooleanField({ initial: false }),
-            identifier: new fields.StringField()
+            identifier: new fields.StringField(),
+            featureForm: new fields.StringField({
+                required: true,
+                initial: 'passive',
+                choices: CONFIG.DH.ITEM.featureForm,
+                label: 'DAGGERHEART.CONFIG.FeatureForm.label'
+            })
         };
     }
 }
diff --git a/module/data/settings/Homebrew.mjs b/module/data/settings/Homebrew.mjs
index 6f280cbd..7572c9ea 100644
--- a/module/data/settings/Homebrew.mjs
+++ b/module/data/settings/Homebrew.mjs
@@ -40,6 +40,38 @@ export default class DhHomebrew extends foundry.abstract.DataModel {
             traitArray: new fields.ArrayField(new fields.NumberField({ required: true, integer: true }), {
                 initial: () => [2, 1, 1, 0, 0, -1]
             }),
+            tokenSizes: new fields.SchemaField({
+                tiny: new fields.NumberField({
+                    integer: false,
+                    initial: 0.5,
+                    label: 'DAGGERHEART.CONFIG.TokenSize.tiny'
+                }),
+                small: new fields.NumberField({
+                    integer: false,
+                    initial: 0.8,
+                    label: 'DAGGERHEART.CONFIG.TokenSize.small'
+                }),
+                medium: new fields.NumberField({
+                    integer: false,
+                    initial: 1,
+                    label: 'DAGGERHEART.CONFIG.TokenSize.medium'
+                }),
+                large: new fields.NumberField({
+                    integer: false,
+                    initial: 2,
+                    label: 'DAGGERHEART.CONFIG.TokenSize.large'
+                }),
+                huge: new fields.NumberField({
+                    integer: false,
+                    initial: 3,
+                    label: 'DAGGERHEART.CONFIG.TokenSize.huge'
+                }),
+                gargantuan: new fields.NumberField({
+                    integer: false,
+                    initial: 4,
+                    label: 'DAGGERHEART.CONFIG.TokenSize.gargantuan'
+                })
+            }),
             currency: new fields.SchemaField({
                 title: new fields.StringField({
                     required: true,
diff --git a/module/dice/d20Roll.mjs b/module/dice/d20Roll.mjs
index 387123c4..0256f281 100644
--- a/module/dice/d20Roll.mjs
+++ b/module/dice/d20Roll.mjs
@@ -98,10 +98,10 @@ export default class D20Roll extends DHRoll {
         this.options.roll.modifiers = this.applyBaseBonus();
 
         this.options.experiences?.forEach(m => {
-            if (this.options.data.experiences?.[m])
+            if (this.options.data.system?.experiences?.[m])
                 this.options.roll.modifiers.push({
-                    label: this.options.data.experiences[m].name,
-                    value: this.options.data.experiences[m].value
+                    label: this.options.data.system.experiences[m].name,
+                    value: this.options.data.system.experiences[m].value
                 });
         });
 
diff --git a/module/dice/dhRoll.mjs b/module/dice/dhRoll.mjs
index ce39ed6a..ea24f238 100644
--- a/module/dice/dhRoll.mjs
+++ b/module/dice/dhRoll.mjs
@@ -236,81 +236,3 @@ export default class DHRoll extends Roll {
         return {};
     }
 }
-
-async function automateHopeFear(config) {
-    const automationSettings = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation);
-    const hopeFearAutomation = automationSettings.hopeFear;
-    if (!config.source?.actor ||
-        (game.user.isGM ? !hopeFearAutomation.gm : !hopeFearAutomation.players) ||
-        config.actionType === 'reaction' ||
-        config.tagTeamSelected ||
-        config.skips?.resources)
-        return;
-    const actor = await fromUuid(config.source.actor);
-    let updates = [];
-    if (!actor) return;
-
-    if (config.rerolledRoll) {
-        if (config.roll.result.duality != config.rerolledRoll.result.duality) {
-            const hope = (config.roll.isCritical || config.roll.result.duality === 1 ? 1 : 0)
-                - (config.rerolledRoll.isCritical || config.rerolledRoll.result.duality === 1 ? 1 : 0);
-            const stress = (config.roll.isCritical ? 1 : 0) - (config.rerolledRoll.isCritical ? 1 : 0);
-            const fear = (config.roll.result.duality === -1 ? 1 : 0)
-                - (config.rerolledRoll.result.duality === -1 ? 1 : 0)
-
-            if (hope !== 0)
-                updates.push({ key: 'hope', value: hope, total: -1 * hope, enabled: true });
-            if (stress !== 0)
-                updates.push({ key: 'stress', value: -1 * stress, total: stress, enabled: true });
-            if (fear !== 0)
-                updates.push({ key: 'fear', value: fear, total: -1 * fear, enabled: true });
-        }
-    } else {
-        if (config.roll.isCritical || config.roll.result.duality === 1)
-            updates.push({ key: 'hope', value: 1, total: -1, enabled: true });
-        if (config.roll.isCritical)
-            updates.push({ key: 'stress', value: -1, total: 1, enabled: true });
-        if (config.roll.result.duality === -1)
-            updates.push({ key: 'fear', value: 1, total: -1, enabled: true });
-    }
-
-    if (updates.length) {
-        const target = actor.system.partner ?? actor;
-        if (!['dead', 'defeated', 'unconscious'].some(x => actor.statuses.has(x))) {
-            await target.modifyResource(updates);
-        }
-    }
-}
-
-export const registerRollDiceHooks = () => {
-    Hooks.on(`${CONFIG.DH.id}.postRollDuality`, async (config, message) => {
-        const automationSettings = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation);
-        if (
-            automationSettings.countdownAutomation &&
-            config.actionType !== CONFIG.DH.ITEM.actionTypes.reaction.id &&
-            !config.tagTeamSelected &&
-            !config.skips?.updateCountdowns
-        ) {
-            const { updateCountdowns } = game.system.api.applications.ui.DhCountdowns;
-
-            if (config.roll.result.duality === -1) {
-                await updateCountdowns(CONFIG.DH.GENERAL.countdownProgressionTypes.actionRoll.id,
-                    CONFIG.DH.GENERAL.countdownProgressionTypes.fear.id);
-            } else {
-                await updateCountdowns(CONFIG.DH.GENERAL.countdownProgressionTypes.actionRoll.id);
-            }
-        }
-
-        await automateHopeFear(config);
-
-        if (!config.roll.hasOwnProperty('success') && !config.targets?.length) return;
-
-        const rollResult = config.roll.success || config.targets.some(t => t.hit),
-            looseSpotlight = !rollResult || config.roll.result.duality === -1;
-
-        if (looseSpotlight && game.combat?.active) {
-            const currentCombatant = game.combat.combatants.get(game.combat.current?.combatantId);
-            if (currentCombatant?.actorId == actor.id) ui.combat.setCombatantSpotlight(currentCombatant.id);
-        }
-    });
-};
diff --git a/module/dice/dualityRoll.mjs b/module/dice/dualityRoll.mjs
index 59cb6e02..91c0a197 100644
--- a/module/dice/dualityRoll.mjs
+++ b/module/dice/dualityRoll.mjs
@@ -2,6 +2,7 @@ import D20RollDialog from '../applications/dialogs/d20RollDialog.mjs';
 import D20Roll from './d20Roll.mjs';
 import { setDiceSoNiceForDualityRoll } from '../helpers/utils.mjs';
 import { getDiceSoNicePresets } from '../config/generalConfig.mjs';
+import { ResourceUpdateMap } from '../data/action/baseAction.mjs';
 
 export default class DualityRoll extends D20Roll {
     _advantageFaces = 6;
@@ -19,7 +20,7 @@ export default class DualityRoll extends D20Roll {
 
     get title() {
         return game.i18n.localize(
-            `DAGGERHEART.GENERAL.${this.options?.actionType === CONFIG.DH.ITEM.actionTypes.reaction.id ? 'reactionRoll' : 'dualityRoll'}`
+            `DAGGERHEART.GENERAL.${this.options?.actionType === 'reaction' ? 'reactionRoll' : 'dualityRoll'}`
         );
     }
 
@@ -219,6 +220,88 @@ export default class DualityRoll extends D20Roll {
         return data;
     }
 
+    static async buildPost(roll, config, message) {
+        await super.buildPost(roll, config, message);
+
+        await DualityRoll.dualityUpdate(config);
+    }
+
+    static async addDualityResourceUpdates(config) {
+        const automationSettings = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation);
+        const hopeFearAutomation = automationSettings.hopeFear;
+        if (
+            !config.source?.actor ||
+            (game.user.isGM ? !hopeFearAutomation.gm : !hopeFearAutomation.players) ||
+            config.actionType === 'reaction' ||
+            config.tagTeamSelected ||
+            config.skips?.resources
+        )
+            return;
+        const actor = await fromUuid(config.source.actor);
+        let updates = [];
+        if (!actor) return;
+
+        if (config.rerolledRoll) {
+            if (config.roll.result.duality != config.rerolledRoll.result.duality) {
+                const hope =
+                    (config.roll.isCritical || config.roll.result.duality === 1 ? 1 : 0) -
+                    (config.rerolledRoll.isCritical || config.rerolledRoll.result.duality === 1 ? 1 : 0);
+                const stress = (config.roll.isCritical ? 1 : 0) - (config.rerolledRoll.isCritical ? 1 : 0);
+                const fear =
+                    (config.roll.result.duality === -1 ? 1 : 0) - (config.rerolledRoll.result.duality === -1 ? 1 : 0);
+
+                if (hope !== 0) updates.push({ key: 'hope', value: hope, total: -1 * hope, enabled: true });
+                if (stress !== 0) updates.push({ key: 'stress', value: -1 * stress, total: stress, enabled: true });
+                if (fear !== 0) updates.push({ key: 'fear', value: fear, total: -1 * fear, enabled: true });
+            }
+        } else {
+            if (config.roll.isCritical || config.roll.result.duality === 1)
+                updates.push({ key: 'hope', value: 1, total: -1, enabled: true });
+            if (config.roll.isCritical) updates.push({ key: 'stress', value: -1, total: 1, enabled: true });
+            if (config.roll.result.duality === -1) updates.push({ key: 'fear', value: 1, total: -1, enabled: true });
+        }
+
+        if (updates.length) {
+            // const target = actor.system.partner ?? actor;
+            if (!['dead', 'defeated', 'unconscious'].some(x => actor.statuses.has(x))) {
+                config.resourceUpdates.addResources(updates);
+            }
+        }
+    }
+
+    static async dualityUpdate(config) {
+        const automationSettings = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation);
+        if (
+            automationSettings.countdownAutomation &&
+            config.actionType !== 'reaction' &&
+            !config.tagTeamSelected &&
+            !config.skips?.updateCountdowns
+        ) {
+            const { updateCountdowns } = game.system.api.applications.ui.DhCountdowns;
+
+            if (config.roll.result.duality === -1) {
+                await updateCountdowns(
+                    CONFIG.DH.GENERAL.countdownProgressionTypes.actionRoll.id,
+                    CONFIG.DH.GENERAL.countdownProgressionTypes.fear.id
+                );
+            } else {
+                await updateCountdowns(CONFIG.DH.GENERAL.countdownProgressionTypes.actionRoll.id);
+            }
+        }
+
+        await DualityRoll.addDualityResourceUpdates(config);
+
+        if (!config.roll.hasOwnProperty('success') && !config.targets?.length) return;
+
+        const rollResult = config.roll.success || config.targets?.some(t => t.hit),
+            looseSpotlight = !rollResult || config.roll.result.duality === -1;
+
+        if (looseSpotlight && game.combat?.active) {
+            const currentCombatant = game.combat.combatants.get(game.combat.current?.combatantId);
+            if (currentCombatant?.actorId == actor.id) ui.combat.setCombatantSpotlight(currentCombatant.id);
+        }
+    }
+
     static async reroll(rollString, target, message) {
         let parsedRoll = game.system.api.dice.DualityRoll.fromData({ ...rollString, evaluated: false });
         const term = parsedRoll.terms[target.dataset.dieIndex];
@@ -257,13 +340,20 @@ export default class DualityRoll extends D20Roll {
         newRoll.extra = newRoll.extra.slice(2);
 
         const tagTeamSettings = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.TagTeamRoll);
-        Hooks.call(`${CONFIG.DH.id}.postRollDuality`, {
+
+        const actor = message.system.source.actor ? await foundry.utils.fromUuid(message.system.source.actor) : null;
+        const config = {
             source: { actor: message.system.source.actor ?? '' },
             targets: message.system.targets,
             tagTeamSelected: Object.values(tagTeamSettings.members).some(x => x.messageId === message._id),
             roll: newRoll,
-            rerolledRoll: message.system.roll
-        });
+            rerolledRoll: message.system.roll,
+            resourceUpdates: new ResourceUpdateMap(actor)
+        };
+
+        await DualityRoll.addDualityResourceUpdates(config);
+        await config.resourceUpdates.updateResources();
+
         return { newRoll, parsedRoll };
     }
 }
diff --git a/module/documents/_module.mjs b/module/documents/_module.mjs
index af1e9942..22718bea 100644
--- a/module/documents/_module.mjs
+++ b/module/documents/_module.mjs
@@ -4,6 +4,7 @@ export { default as DhpCombat } from './combat.mjs';
 export { default as DHCombatant } from './combatant.mjs';
 export { default as DhActiveEffect } from './activeEffect.mjs';
 export { default as DhChatMessage } from './chatMessage.mjs';
+export { default as DhScene } from './scene.mjs';
 export { default as DhToken } from './token.mjs';
 export { default as DhTooltipManager } from './tooltipManager.mjs';
 export { default as DhTemplateManager } from './templateManager.mjs';
diff --git a/module/documents/activeEffect.mjs b/module/documents/activeEffect.mjs
index fcf1d590..2297ea27 100644
--- a/module/documents/activeEffect.mjs
+++ b/module/documents/activeEffect.mjs
@@ -194,27 +194,10 @@ export default class DhActiveEffect extends foundry.documents.ActiveEffect {
     }
 
     prepareDerivedData() {
-        /* Preventing subclass features from transferring to actor if they do not have the right subclass advancement */
-        if (this.parent?.type === 'feature') {
-            const origSubclassParent = this.parent.system.originItemType === 'subclass';
-            if (origSubclassParent) {
-                const subclass = this.parent.parent.items.find(
-                    x =>
-                        x.type === 'subclass' &&
-                        x.system.isMulticlass === (this.parent.system.identifier === 'multiclass')
-                );
-
-                if (subclass) {
-                    const featureState = subclass.system.featureState;
-
-                    if (
-                        (this.parent.system.identifier === CONFIG.DH.ITEM.featureSubTypes.specialization &&
-                            featureState < 2) ||
-                        (this.parent.system.identifier === CONFIG.DH.ITEM.featureSubTypes.mastery && featureState < 3)
-                    ) {
-                        this.transfer = false;
-                    }
-                }
+        /* Check for item availability such as in the case of subclass advancement. */
+        if (this.parent?.parent?.system?.isItemAvailable) {
+            if (!this.parent.parent.system.isItemAvailable(this.parent)) {
+                this.transfer = false;
             }
         }
     }
diff --git a/module/documents/actor.mjs b/module/documents/actor.mjs
index c269b686..06b60447 100644
--- a/module/documents/actor.mjs
+++ b/module/documents/actor.mjs
@@ -3,6 +3,7 @@ import { LevelOptionType } from '../data/levelTier.mjs';
 import DHFeature from '../data/item/feature.mjs';
 import { createScrollText, damageKeyToNumber } from '../helpers/utils.mjs';
 import DhCompanionLevelUp from '../applications/levelup/companionLevelup.mjs';
+import { ResourceUpdateMap } from '../data/action/baseAction.mjs';
 
 export default class DhpActor extends Actor {
     parties = new Set();
@@ -73,16 +74,27 @@ export default class DhpActor extends Actor {
     /**@inheritdoc */
     async _preCreate(data, options, user) {
         if ((await super._preCreate(data, options, user)) === false) return false;
+        const update = {};
+
+        // Set default token size. Done here as we do not want to set a datamodel default, since that would apply the sizing to third party actor modules that aren't set up with the size system.
+        if (this.system.metadata.usesSize && !data.system?.size) {
+            Object.assign(update, {
+                system: {
+                    size: CONFIG.DH.ACTOR.tokenSize.medium.id
+                }
+            });
+        }
 
         // Configure prototype token settings
-        const prototypeToken = {};
         if (['character', 'companion', 'party'].includes(this.type))
-            Object.assign(prototypeToken, {
-                sight: { enabled: true },
-                actorLink: true,
-                disposition: CONST.TOKEN_DISPOSITIONS.FRIENDLY
+            Object.assign(update, {
+                prototypeToken: {
+                    sight: { enabled: true },
+                    actorLink: true,
+                    disposition: CONST.TOKEN_DISPOSITIONS.FRIENDLY
+                }
             });
-        this.updateSource({ prototypeToken });
+        this.updateSource(update);
     }
 
     _onUpdate(changes, options, userId) {
@@ -477,6 +489,7 @@ export default class DhpActor extends Actor {
     async diceRoll(config) {
         config.source = { ...(config.source ?? {}), actor: this.uuid };
         config.data = this.getRollData();
+        config.resourceUpdates = new ResourceUpdateMap(this);
         const rollClass = config.roll.lite ? CONFIG.Dice.daggerheart['DHRoll'] : this.rollClass;
         return await rollClass.build(config);
     }
@@ -526,7 +539,7 @@ export default class DhpActor extends Actor {
 
     /**@inheritdoc */
     getRollData() {
-        const rollData = super.getRollData();
+        const rollData = super.getRollData().clone();
         rollData.name = this.name;
         rollData.system = this.system.getRollData();
         rollData.prof = this.system.proficiency ?? 1;
@@ -765,9 +778,10 @@ export default class DhpActor extends Actor {
     }
 
     convertDamageToThreshold(damage) {
-        const massiveDamageEnabled=game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.variantRules).massiveDamage.enabled;
-        if (massiveDamageEnabled && damage >= (this.system.damageThresholds.severe * 2)) {
-            return 4; 
+        const massiveDamageEnabled = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.variantRules)
+            .massiveDamage.enabled;
+        if (massiveDamageEnabled && damage >= this.system.damageThresholds.severe * 2) {
+            return 4;
         }
         return damage >= this.system.damageThresholds.severe ? 3 : damage >= this.system.damageThresholds.major ? 2 : 1;
     }
diff --git a/module/documents/combat.mjs b/module/documents/combat.mjs
index 01cbee61..20996b77 100644
--- a/module/documents/combat.mjs
+++ b/module/documents/combat.mjs
@@ -28,6 +28,7 @@ export default class DhpCombat extends Combat {
                         ...effect,
                         name: game.i18n.localize(effect.name),
                         description: game.i18n.localize(effect.description),
+                        effectTargetTypes: grouping.effectTargetTypes ?? [],
                         flags: {
                             [`${CONFIG.DH.id}.${CONFIG.DH.FLAGS.combatToggle}`]: {
                                 category: toggle.category,
@@ -45,11 +46,7 @@ export default class DhpCombat extends Combat {
             for (let actor of actors) {
                 await actor.createEmbeddedDocuments(
                     'ActiveEffect',
-                    effects.map(effect => ({
-                        ...effect,
-                        name: game.i18n.localize(effect.name),
-                        description: game.i18n.localize(effect.description)
-                    }))
+                    effects.filter(x => x.effectTargetTypes.includes(actor.type))
                 );
             }
         } else {
diff --git a/module/documents/scene.mjs b/module/documents/scene.mjs
new file mode 100644
index 00000000..c6cdd2c2
--- /dev/null
+++ b/module/documents/scene.mjs
@@ -0,0 +1,40 @@
+import DHToken from './token.mjs';
+
+export default class DhScene extends Scene {
+    /** A map of `TokenDocument` IDs embedded in this scene long with new dimensions from actor size-category changes */
+    #sizeSyncBatch = new Map();
+
+    /** Synchronize a token's dimensions with its actor's size category. */
+    syncTokenDimensions(tokenDoc, tokenSize) {
+        if (!tokenDoc.parent?.tokens.has(tokenDoc.id)) return;
+        const prototype = tokenDoc.actor?.prototypeToken ?? tokenDoc;
+        this.#sizeSyncBatch.set(tokenDoc.id, {
+            size: tokenSize,
+            prototypeSize: { width: prototype.width, height: prototype.height },
+            position: { x: tokenDoc.x, y: tokenDoc.y, elevation: tokenDoc.elevation }
+        });
+        this.#processSyncBatch();
+    }
+
+    /** Retrieve size and clear size-sync batch, make updates. */
+    #processSyncBatch = foundry.utils.debounce(() => {
+        const tokenSizes = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).tokenSizes;
+        const entries = this.#sizeSyncBatch
+            .entries()
+            .toArray()
+            .map(([_id, { size, prototypeSize, position }]) => {
+                const tokenSize = tokenSizes[size];
+                const width = size !== CONFIG.DH.ACTOR.tokenSize.custom.id ? tokenSize : prototypeSize.width;
+                const height = size !== CONFIG.DH.ACTOR.tokenSize.custom.id ? tokenSize : prototypeSize.height;
+                const updatedPosition = DHToken.getSnappedPositionInSquareGrid(this.grid, position, width, height);
+                return {
+                    _id,
+                    width,
+                    height,
+                    ...updatedPosition
+                };
+            });
+        this.#sizeSyncBatch.clear();
+        this.updateEmbeddedDocuments('Token', entries, { animation: { movementSpeed: 1.5 } });
+    }, 0);
+}
diff --git a/module/documents/token.mjs b/module/documents/token.mjs
index 6996708b..c3babaa1 100644
--- a/module/documents/token.mjs
+++ b/module/documents/token.mjs
@@ -1,4 +1,4 @@
-export default class DHToken extends TokenDocument {
+export default class DHToken extends CONFIG.Token.documentClass {
     /**
      * Inspect the Actor data model and identify the set of attributes which could be used for a Token Bar.
      * @param {object} attributes       The tracked attributes which can be chosen from
@@ -100,4 +100,440 @@ export default class DHToken extends TokenDocument {
         }
         super.deleteCombatants(tokens, combat ?? {});
     }
+
+    /**@inheritdoc */
+    static async _preCreateOperation(documents, operation, user) {
+        const allowed = await super._preCreateOperation(documents, operation, user);
+        if (allowed === false) return false;
+
+        const tokenSizes = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).tokenSizes;
+        for (const document of documents) {
+            const actor = document.actor;
+            if (actor?.system.metadata.usesSize) {
+                const tokenSize = tokenSizes[actor.system.size];
+                if (tokenSize && actor.system.size !== CONFIG.DH.ACTOR.tokenSize.custom.id) {
+                    document.updateSource({
+                        width: tokenSize,
+                        height: tokenSize
+                    });
+                }
+            }
+        }
+    }
+
+    /**@inheritdoc */
+    _onRelatedUpdate(update = {}, operation = {}) {
+        super._onRelatedUpdate(update, operation);
+
+        if (!this.actor?.isOwner) return;
+
+        const updates = Array.isArray(update) ? update : [update];
+        const activeGM = game.users.activeGM; // Let the active GM take care of updates if available
+        for (let update of updates) {
+            if (
+                this.actor.system.metadata.usesSize &&
+                update.system?.size &&
+                activeGM &&
+                game.user.id === activeGM.id
+            ) {
+                const tokenSizes = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).tokenSizes;
+                const tokenSize = tokenSizes[update.system.size];
+                if (tokenSize !== this.width || tokenSize !== this.height) {
+                    this.parent?.syncTokenDimensions(this, update.system.size);
+                }
+            }
+        }
+    }
+
+    /**@inheritdoc */
+    getSnappedPosition(data = {}) {
+        const grid = this.parent?.grid ?? BaseScene.defaultGrid;
+        const x = data.x ?? this.x;
+        const y = data.y ?? this.y;
+        let elevation = data.elevation ?? this.elevation;
+        const unsnapped = { x, y, elevation };
+
+        // Gridless grid
+        if (grid.isGridless) return unsnapped;
+
+        // Get position and elevation
+        elevation = Math.round(elevation / grid.distance) * grid.distance;
+
+        let width = data.width ?? this.width;
+        let height = data.height ?? this.height;
+
+        if (this.actor?.system.metadata.usesSize) {
+            const tokenSizes = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).tokenSizes;
+            const tokenSize = tokenSizes[this.actor.system.size];
+            if (tokenSize && this.actor.system.size !== CONFIG.DH.ACTOR.tokenSize.custom.id) {
+                width = tokenSize ?? width;
+                height = tokenSize ?? height;
+            }
+        }
+
+        // Round width and height to nearest multiple of 0.5 if not small
+        width = width < 1 ? width : Math.round(width * 2) / 2;
+        height = height < 1 ? height : Math.round(height * 2) / 2;
+        const shape = data.shape ?? this.shape;
+
+        // Square grid
+        let snapped;
+        if (grid.isSquare) snapped = DHToken.getSnappedPositionInSquareGrid(grid, unsnapped, width, height);
+        // Hexagonal grid
+        else snapped = DHToken.getSnappedPositionInHexagonalGrid(grid, unsnapped, width, height, shape);
+        return { x: snapped.x, y: snapped.y, elevation };
+    }
+
+    static getSnappedPositionInSquareGrid(grid, position, width, height) {
+        const M = CONST.GRID_SNAPPING_MODES;
+        // Small tokens snap to any vertex of the subgrid with resolution 4
+        // where the token is fully contained within the grid space
+        const isTiny = (width === 0.5 && height <= 1) || (width <= 1 && height === 0.5);
+        if (isTiny) {
+            let x = position.x / grid.size;
+            let y = position.y / grid.size;
+            if (width === 1) x = Math.round(x);
+            else {
+                x = Math.floor(x * 8);
+                const k = ((x % 8) + 8) % 8;
+                if (k >= 6) x = Math.ceil(x / 8);
+                else if (k === 5) x = Math.floor(x / 8) + 0.5;
+                else x = Math.round(x / 2) / 4;
+            }
+            if (height === 1) y = Math.round(y);
+            else {
+                y = Math.floor(y * 8);
+                const k = ((y % 8) + 8) % 8;
+                if (k >= 6) y = Math.ceil(y / 8);
+                else if (k === 5) y = Math.floor(y / 8) + 0.5;
+                else y = Math.round(y / 2) / 4;
+            }
+
+            x *= grid.size;
+            y *= grid.size;
+
+            return { x, y };
+        } else if (width < 1 && height < 1) {
+            // isSmall
+            let xGrid = Math.round(position.x / grid.size);
+            let yGrid = Math.round(position.y / grid.size);
+
+            const x = xGrid * grid.size + grid.size / 2 - (width * grid.size) / 2;
+            const y = yGrid * grid.size + grid.size / 2 - (height * grid.size) / 2;
+
+            return { x, y };
+        }
+
+        const modeX = Number.isInteger(width) ? M.VERTEX : M.VERTEX | M.EDGE_MIDPOINT | M.CENTER;
+        const modeY = Number.isInteger(height) ? M.VERTEX : M.VERTEX | M.EDGE_MIDPOINT | M.CENTER;
+
+        if (modeX === modeY) return grid.getSnappedPoint(position, { mode: modeX });
+
+        return {
+            x: grid.getSnappedPoint(position, { mode: modeX }).x,
+            y: grid.getSnappedPoint(position, { mode: modeY }).y
+        };
+    }
+
+    //#region CopyPasta for mean private methods that have to be duplicated
+    static getSnappedPositionInHexagonalGrid(grid, position, width, height, shape) {
+        // Hexagonal shape
+        const hexagonalShape = DHToken.#getHexagonalShape(width, height, shape, grid.columns);
+        if (hexagonalShape) {
+            const offsetX = hexagonalShape.anchor.x * grid.sizeX;
+            const offsetY = hexagonalShape.anchor.y * grid.sizeY;
+            position = grid.getCenterPoint({ x: position.x + offsetX, y: position.y + offsetY });
+            position.x -= offsetX;
+            position.y -= offsetY;
+            return position;
+        }
+
+        // Rectagular shape
+        const M = CONST.GRID_SNAPPING_MODES;
+        return grid.getSnappedPoint(position, { mode: M.CENTER | M.VERTEX | M.CORNER | M.SIDE_MIDPOINT });
+    }
+
+    /**
+     * The cache of hexagonal shapes.
+     * @type {Map<string, DeepReadonly<TokenHexagonalShapeData>>}
+     */
+    static #hexagonalShapes = new Map();
+
+    static #getHexagonalShape(width, height, shape, columns) {
+        if (!Number.isInteger(width * 2) || !Number.isInteger(height * 2)) return null;
+
+        // TODO: can we set a max of 2^13 on width and height so that we may use an integer key?
+        const key = `${width},${height},${shape}${columns ? 'C' : 'R'}`;
+        let data = DHToken.#hexagonalShapes.get(key);
+        if (data) return data;
+
+        // Hexagon symmetry
+        if (columns) {
+            const rowData = BaseToken.#getHexagonalShape(height, width, shape, false);
+            if (!rowData) return null;
+
+            // Transpose the offsets/points of the shape in row orientation
+            const offsets = { even: [], odd: [] };
+            for (const { i, j } of rowData.offsets.even) offsets.even.push({ i: j, j: i });
+            for (const { i, j } of rowData.offsets.odd) offsets.odd.push({ i: j, j: i });
+            offsets.even.sort(({ i: i0, j: j0 }, { i: i1, j: j1 }) => j0 - j1 || i0 - i1);
+            offsets.odd.sort(({ i: i0, j: j0 }, { i: i1, j: j1 }) => j0 - j1 || i0 - i1);
+            const points = [];
+            for (let i = rowData.points.length; i > 0; i -= 2) {
+                points.push(rowData.points[i - 1], rowData.points[i - 2]);
+            }
+            data = {
+                offsets,
+                points,
+                center: { x: rowData.center.y, y: rowData.center.x },
+                anchor: { x: rowData.anchor.y, y: rowData.anchor.x }
+            };
+        }
+
+        // Small hexagon
+        else if (width === 0.5 && height === 0.5) {
+            data = {
+                offsets: { even: [{ i: 0, j: 0 }], odd: [{ i: 0, j: 0 }] },
+                points: [0.25, 0.0, 0.5, 0.125, 0.5, 0.375, 0.25, 0.5, 0.0, 0.375, 0.0, 0.125],
+                center: { x: 0.25, y: 0.25 },
+                anchor: { x: 0.25, y: 0.25 }
+            };
+        }
+
+        // Normal hexagon
+        else if (width === 1 && height === 1) {
+            data = {
+                offsets: { even: [{ i: 0, j: 0 }], odd: [{ i: 0, j: 0 }] },
+                points: [0.5, 0.0, 1.0, 0.25, 1, 0.75, 0.5, 1.0, 0.0, 0.75, 0.0, 0.25],
+                center: { x: 0.5, y: 0.5 },
+                anchor: { x: 0.5, y: 0.5 }
+            };
+        }
+
+        // Hexagonal ellipse or trapezoid
+        else if (shape <= CONST.TOKEN_SHAPES.TRAPEZOID_2) {
+            data = DHToken.#createHexagonalEllipseOrTrapezoid(width, height, shape);
+        }
+
+        // Hexagonal rectangle
+        else if (shape <= CONST.TOKEN_SHAPES.RECTANGLE_2) {
+            data = DHToken.#createHexagonalRectangle(width, height, shape);
+        }
+
+        // Cache the shape
+        if (data) {
+            foundry.utils.deepFreeze(data);
+            DHToken.#hexagonalShapes.set(key, data);
+        }
+
+        return data;
+    }
+
+    static #createHexagonalEllipseOrTrapezoid(width, height, shape) {
+        if (!Number.isInteger(width) || !Number.isInteger(height)) return null;
+        const points = [];
+        let top;
+        let bottom;
+        switch (shape) {
+            case CONST.TOKEN_SHAPES.ELLIPSE_1:
+                if (height >= 2 * width) return null;
+                top = Math.floor(height / 2);
+                bottom = Math.floor((height - 1) / 2);
+                break;
+            case CONST.TOKEN_SHAPES.ELLIPSE_2:
+                if (height >= 2 * width) return null;
+                top = Math.floor((height - 1) / 2);
+                bottom = Math.floor(height / 2);
+                break;
+            case CONST.TOKEN_SHAPES.TRAPEZOID_1:
+                if (height > width) return null;
+                top = height - 1;
+                bottom = 0;
+                break;
+            case CONST.TOKEN_SHAPES.TRAPEZOID_2:
+                if (height > width) return null;
+                top = 0;
+                bottom = height - 1;
+                break;
+        }
+        const offsets = { even: [], odd: [] };
+        for (let i = bottom; i > 0; i--) {
+            for (let j = 0; j < width - i; j++) {
+                offsets.even.push({ i: bottom - i, j: j + (((bottom & 1) + i + 1) >> 1) });
+                offsets.odd.push({ i: bottom - i, j: j + (((bottom & 1) + i) >> 1) });
+            }
+        }
+        for (let i = 0; i <= top; i++) {
+            for (let j = 0; j < width - i; j++) {
+                offsets.even.push({ i: bottom + i, j: j + (((bottom & 1) + i + 1) >> 1) });
+                offsets.odd.push({ i: bottom + i, j: j + (((bottom & 1) + i) >> 1) });
+            }
+        }
+        let x = 0.5 * bottom;
+        let y = 0.25;
+        for (let k = width - bottom; k--; ) {
+            points.push(x, y);
+            x += 0.5;
+            y -= 0.25;
+            points.push(x, y);
+            x += 0.5;
+            y += 0.25;
+        }
+        points.push(x, y);
+        for (let k = bottom; k--; ) {
+            y += 0.5;
+            points.push(x, y);
+            x += 0.5;
+            y += 0.25;
+            points.push(x, y);
+        }
+        y += 0.5;
+        for (let k = top; k--; ) {
+            points.push(x, y);
+            x -= 0.5;
+            y += 0.25;
+            points.push(x, y);
+            y += 0.5;
+        }
+        for (let k = width - top; k--; ) {
+            points.push(x, y);
+            x -= 0.5;
+            y += 0.25;
+            points.push(x, y);
+            x -= 0.5;
+            y -= 0.25;
+        }
+        points.push(x, y);
+        for (let k = top; k--; ) {
+            y -= 0.5;
+            points.push(x, y);
+            x -= 0.5;
+            y -= 0.25;
+            points.push(x, y);
+        }
+        y -= 0.5;
+        for (let k = bottom; k--; ) {
+            points.push(x, y);
+            x += 0.5;
+            y -= 0.25;
+            points.push(x, y);
+            y -= 0.5;
+        }
+        return {
+            offsets,
+            points,
+            // We use the centroid of the polygon for ellipse and trapzoid shapes
+            center: foundry.utils.polygonCentroid(points),
+            anchor: bottom % 2 ? { x: 0.0, y: 0.5 } : { x: 0.5, y: 0.5 }
+        };
+    }
+
+    /**
+     * Create the row-based hexagonal rectangle given the type, width, and height.
+     * @param {number} width                      The width of the Token (positive)
+     * @param {number} height                     The height of the Token (positive)
+     * @param {TokenShapeType} shape              The shape type (must be RECTANGLE_1 or RECTANGLE_2)
+     * @returns {TokenHexagonalShapeData|null}    The hexagonal shape or null if there is no shape
+     *                                            for the given combination of arguments
+     */
+    static #createHexagonalRectangle(width, height, shape) {
+        if (width < 1 || !Number.isInteger(height)) return null;
+        if (width === 1 && height > 1) return null;
+        if (!Number.isInteger(width) && height === 1) return null;
+
+        const even = shape === CONST.TOKEN_SHAPES.RECTANGLE_1 || height === 1;
+        const offsets = { even: [], odd: [] };
+        for (let i = 0; i < height; i++) {
+            const j0 = even ? 0 : (i + 1) & 1;
+            const j1 = ((width + (i & 1) * 0.5) | 0) - (even ? i & 1 : 0);
+            for (let j = j0; j < j1; j++) {
+                offsets.even.push({ i, j: j + (i & 1) });
+                offsets.odd.push({ i, j });
+            }
+        }
+        let x = even ? 0.0 : 0.5;
+        let y = 0.25;
+        const points = [x, y];
+        while (x + 1 <= width) {
+            x += 0.5;
+            y -= 0.25;
+            points.push(x, y);
+            x += 0.5;
+            y += 0.25;
+            points.push(x, y);
+        }
+        if (x !== width) {
+            y += 0.5;
+            points.push(x, y);
+            x += 0.5;
+            y += 0.25;
+            points.push(x, y);
+        }
+        while (y + 1.5 <= 0.75 * height) {
+            y += 0.5;
+            points.push(x, y);
+            x -= 0.5;
+            y += 0.25;
+            points.push(x, y);
+            y += 0.5;
+            points.push(x, y);
+            x += 0.5;
+            y += 0.25;
+            points.push(x, y);
+        }
+        if (y + 0.75 < 0.75 * height) {
+            y += 0.5;
+            points.push(x, y);
+            x -= 0.5;
+            y += 0.25;
+            points.push(x, y);
+        }
+        y += 0.5;
+        points.push(x, y);
+        while (x - 1 >= 0) {
+            x -= 0.5;
+            y += 0.25;
+            points.push(x, y);
+            x -= 0.5;
+            y -= 0.25;
+            points.push(x, y);
+        }
+        if (x !== 0) {
+            y -= 0.5;
+            points.push(x, y);
+            x -= 0.5;
+            y -= 0.25;
+            points.push(x, y);
+        }
+        while (y - 1.5 > 0) {
+            y -= 0.5;
+            points.push(x, y);
+            x += 0.5;
+            y -= 0.25;
+            points.push(x, y);
+            y -= 0.5;
+            points.push(x, y);
+            x -= 0.5;
+            y -= 0.25;
+            points.push(x, y);
+        }
+        if (y - 0.75 > 0) {
+            y -= 0.5;
+            points.push(x, y);
+            x += 0.5;
+            y -= 0.25;
+            points.push(x, y);
+        }
+        return {
+            offsets,
+            points,
+            // We use center of the rectangle (and not the centroid of the polygon) for the rectangle shapes
+            center: {
+                x: width / 2,
+                y: (0.75 * Math.floor(height) + 0.5 * (height % 1) + 0.25) / 2
+            },
+            anchor: even ? { x: 0.5, y: 0.5 } : { x: 0.0, y: 0.5 }
+        };
+    }
+    //#endregion
 }
diff --git a/module/systemRegistration/settings.mjs b/module/systemRegistration/settings.mjs
index d08d65d1..053325a8 100644
--- a/module/systemRegistration/settings.mjs
+++ b/module/systemRegistration/settings.mjs
@@ -21,8 +21,8 @@ export const registerDHSettings = () => {
         scope: 'world',
         config: true,
         type: Boolean,
-        onChange: () => ui.combat.render(),
-    })
+        onChange: () => ui.combat.render()
+    });
 };
 
 const registerMenuSettings = () => {
@@ -46,6 +46,9 @@ const registerMenuSettings = () => {
             if (value.maxFear) {
                 if (ui.resources) ui.resources.render({ force: true });
             }
+
+            // Some homebrew settings may change sheets in various ways, so trigger a re-render
+            resetActors();
         }
     });
 
@@ -140,3 +143,25 @@ const registerNonConfigSettings = () => {
         type: DhTagTeamRoll
     });
 };
+
+/**
+ * Triggers a reset and non-forced re-render on all given actors (if given)
+ * or all world actors and actors in all scenes to show immediate results for a changed setting.
+ */
+function resetActors(actors) {
+    actors ??= [
+        game.actors.contents,
+        game.scenes.contents.flatMap(s => s.tokens.contents).flatMap(t => t.actor ?? [])
+    ].flat();
+    actors = new Set(actors);
+    for (const actor of actors) {
+        for (const app of Object.values(actor.apps)) {
+            for (const element of app.element?.querySelectorAll('prose-mirror.active')) {
+                element.open = false; // This triggers a save
+            }
+        }
+
+        actor.reset();
+        actor.render();
+    }
+}
diff --git a/module/systemRegistration/socket.mjs b/module/systemRegistration/socket.mjs
index 27bf48c5..046f1b68 100644
--- a/module/systemRegistration/socket.mjs
+++ b/module/systemRegistration/socket.mjs
@@ -73,10 +73,13 @@ export const registerSocketHooks = () => {
                     Hooks.callAll(socketEvent.Refresh, { refreshType: RefreshType.Countdown });
                     break;
                 case GMUpdateEvent.UpdateSaveMessage:
-                    const action = await fromUuid(data.update.action),
-                        message = game.messages.get(data.update.message);
-                    if (!action || !message) return;
-                    action.updateSaveMessage(data.update.result, message, data.update.token);
+                    const message = game.messages.get(data.update.message);
+                    if (!message) return;
+                    game.system.api.fields.ActionFields.SaveField.updateSaveMessage(
+                        data.update.result,
+                        message,
+                        data.update.token
+                    );
                     break;
             }
 
diff --git a/src/packs/adversaries/adversary_Acid_Burrower_89yAh30vaNQOALlz.json b/src/packs/adversaries/adversary_Acid_Burrower_89yAh30vaNQOALlz.json
index 8060ab72..e2b3a444 100644
--- a/src/packs/adversaries/adversary_Acid_Burrower_89yAh30vaNQOALlz.json
+++ b/src/packs/adversaries/adversary_Acid_Burrower_89yAh30vaNQOALlz.json
@@ -40,7 +40,8 @@
     "experiences": {
       "pe7OIoJsqlpMXEvs": {
         "name": "Tremor Sense",
-        "value": 2
+        "value": 2,
+        "description": ""
       }
     },
     "bonuses": {
@@ -148,7 +149,8 @@
       "source": "Daggerheart SRD",
       "page": 75,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "ownership": {
@@ -258,14 +260,14 @@
       "_id": "MFmGN6Tbf5GYxrQ9",
       "img": "icons/magic/unholy/silhouette-evil-horned-giant.webp",
       "system": {
-        "description": "<p>The Burrower can be spotlighted up to three times per GM turn. Spend Fear as usual to spotlight them.</p>",
+        "description": "<p>The @Lookup[@name] can be spotlighted up to three times per GM turn. Spend Fear as usual to spotlight them.</p>",
         "resource": null,
         "actions": {
           "3lGGgkxnzgUwHGIp": {
             "type": "effect",
             "_id": "3lGGgkxnzgUwHGIp",
             "systemPath": "actions",
-            "description": "<p>The Burrower can be spotlighted up to three times per GM turn. Spend Fear as usual to spotlight them.</p>",
+            "description": "",
             "chatDisplay": false,
             "actionType": "passive",
             "cost": [
@@ -317,14 +319,14 @@
       "_id": "ctXYwil2D1zfsekT",
       "img": "icons/magic/earth/barrier-stone-explosion-red.webp",
       "system": {
-        "description": "<p><strong>Mark a Stress</strong> to have the Burrower burst out of the ground. All creatures within Very Close range must succeed on an Agility Reaction Roll or be knocked over, making them Vulnerable until they next act.</p><p>@Template[type:emanation|range:vc]</p>",
+        "description": "<p><strong>Mark a Stress</strong> to have the @Lookup[@name] burst out of the ground. All creatures within Very Close range must succeed on an Agility Reaction Roll or be knocked over, making them Vulnerable until they next act.</p><p>@Template[type:emanation|range:vc]</p>",
         "resource": null,
         "actions": {
           "4ppSeiTdbqnMzWAs": {
             "type": "attack",
             "_id": "4ppSeiTdbqnMzWAs",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to have the Burrower burst out of the ground. All creatures within Very Close range must succeed on an Agility Reaction Roll or be knocked over, making them Vulnerable until they next act.</p><p>@Template[type:emanation|range:vc]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -381,7 +383,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [
         {
@@ -441,14 +444,14 @@
       "_id": "UpFsnlbZkyvM2Ftv",
       "img": "icons/magic/acid/projectile-smoke-glowing.webp",
       "system": {
-        "description": "<p>Make an attack against all targets in front of the Burrower within Close range. Targets the Burrower succeeds against take <strong>2d6</strong> physical damage and must mark an Armor Slot without receiving its benefits (they can still use armor to reduce the damage). If they can’t mark an Armor Slot, they must mark an additional HP and you gain a Fear.</p><p>@Template[type:inFront|range:c]</p>",
+        "description": "<p>Make an attack against all targets in front of the @Lookup[@name] within Close range. Targets the @Lookup[@name] succeeds against take <strong>2d6</strong> physical damage and must mark an Armor Slot without receiving its benefits (they can still use armor to reduce the damage). If they can’t mark an Armor Slot, they must mark an additional HP and you gain a Fear.</p><p>@Template[type:inFront|range:c]</p>",
         "resource": null,
         "actions": {
           "yd10HwK6Wa3OEvv2": {
             "type": "attack",
             "_id": "yd10HwK6Wa3OEvv2",
             "systemPath": "actions",
-            "description": "<p>Make an attack against all targets in front of the Burrower within Close range. Targets the Burrower succeeds against take <strong>2d6</strong> physical damage and must mark an Armor Slot without receiving its benefi ts (they can still use armor to reduce the damage). If they can’t mark an Armor Slot, they must mark an additional HP and you gain a Fear.</p><p>@Template[type:inFront|range:c]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -546,7 +549,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
@@ -567,14 +571,14 @@
       "_id": "aNIVT5LKhwLyjKpI",
       "img": "icons/magic/acid/dissolve-drip-droplet-smoke.webp",
       "system": {
-        "description": "<p>When the Burrower takes Severe damage, all creatures within Close range are bathed in their acidic blood, taking <strong>1d10</strong> physical damage. This splash covers the ground within Very Close range with blood, and all creatures other than the Burrower who move through it take <strong>1d6</strong> physical damage.</p><p>@Template[type:emanation|range:c]</p>",
+        "description": "<p>When the @Lookup[@name] takes Severe damage, all creatures within Close range are bathed in their acidic blood, taking <strong>1d10</strong> physical damage. This splash covers the ground within Very Close range with blood, and all creatures other than the @Lookup[@name] who move through it take <strong>1d6</strong> physical damage.</p><p>@Template[type:emanation|range:c]</p>",
         "resource": null,
         "actions": {
           "XbtTzOBvlTaxOKTy": {
             "type": "damage",
             "_id": "XbtTzOBvlTaxOKTy",
             "systemPath": "actions",
-            "description": "<p>When the Burrower takes Severe damage, all creatures within Close range are bathed in their acidic blood, taking <strong>1d10</strong> physical damage. This splash covers the ground within Very Close range with blood, and all creatures other than the Burrower who move through it take <strong>1d6</strong> physical damage.</p><p>@Template[type:emanation|range:c]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -628,7 +632,7 @@
             "type": "damage",
             "_id": "xpcp1ECTWF20kxve",
             "systemPath": "actions",
-            "description": "<p>This splash covers the ground within Very Close range with blood, and all creatures other than the Burrower who move through it take <strong>1d6</strong> physical damage.</p>",
+            "description": "<p>This splash covers the ground within Very Close range with blood, and all creatures other than the @Lookup[@name] who move through it take <strong>1d6</strong> physical damage.</p>",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -681,7 +685,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "effects": [],
       "folder": null,
diff --git a/src/packs/adversaries/adversary_Adult_Flickerfly_G7jiltRjgvVhZewm.json b/src/packs/adversaries/adversary_Adult_Flickerfly_G7jiltRjgvVhZewm.json
index 0e3a89c6..266cba24 100644
--- a/src/packs/adversaries/adversary_Adult_Flickerfly_G7jiltRjgvVhZewm.json
+++ b/src/packs/adversaries/adversary_Adult_Flickerfly_G7jiltRjgvVhZewm.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 91,
       "artist": ""
-    }
+    },
+    "size": "gargantuan"
   },
   "flags": {},
   "_id": "G7jiltRjgvVhZewm",
@@ -220,14 +221,14 @@
       "name": "Relentless (4)",
       "type": "feature",
       "system": {
-        "description": "<p>The Flickerfly can be spotlighted up to four times per GM turn. Spend Fear as usual to spotlight them.</p>",
+        "description": "<p>The @Lookup[@name] can be spotlighted up to four times per GM turn. Spend Fear as usual to spotlight them.</p>",
         "resource": null,
         "actions": {
           "poUhJdSkhjiVL2Vp": {
             "type": "effect",
             "_id": "poUhJdSkhjiVL2Vp",
             "systemPath": "actions",
-            "description": "<p>The Flickerfly can be spotlighted up to four times per GM turn. Spend Fear as usual to spotlight them.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "passive",
             "cost": [
@@ -263,7 +264,7 @@
       "img": "icons/magic/unholy/silhouette-evil-horned-giant.webp",
       "effects": [],
       "folder": null,
-      "sort": 0,
+      "sort": 100000,
       "ownership": {
         "default": 0,
         "MQSznptE5yLT7kj8": 3
@@ -278,14 +279,14 @@
       "name": "Never Misses",
       "type": "feature",
       "system": {
-        "description": "<p>When the Flickerfly makes an attack, the target’s Evasion is halved against the attack.</p>",
+        "description": "<p>When the @Lookup[@name] makes an attack, the target’s Evasion is halved against the attack.</p>",
         "resource": null,
         "actions": {
           "VRGPnDhDpReXUZZF": {
             "type": "effect",
             "_id": "VRGPnDhDpReXUZZF",
             "systemPath": "actions",
-            "description": "<p>When the Flickerfly makes an attack, the target’s Evasion is halved against the attack.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "passive",
             "cost": [],
@@ -360,7 +361,7 @@
         }
       ],
       "folder": null,
-      "sort": 0,
+      "sort": 200000,
       "ownership": {
         "default": 0,
         "MQSznptE5yLT7kj8": 3
@@ -375,14 +376,14 @@
       "name": "Whirlwind",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Spend a Fear</strong> to whirl, making an attack against all targets within Very Close range. Targets the Flickerfly succeeds against take <strong>3d8</strong> direct physical damage.</p><p>@Template[type:emanation|range:vc]</p>",
+        "description": "<p><strong>Spend a Fear</strong> to whirl, making an attack against all targets within Very Close range. Targets the @Lookup[@name] succeeds against take <strong>3d8</strong> direct physical damage.</p><p>@Template[type:emanation|range:vc]</p>",
         "resource": null,
         "actions": {
           "RV1wKufKrMPN6MOo": {
             "type": "attack",
             "_id": "RV1wKufKrMPN6MOo",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to whirl, making an attack against all targets within Very Close range. Targets the Flickerfly succeeds against take <strong>3d8</strong> direct physical damage.</p><p>@Template[type:emanation|range:vc]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -461,13 +462,14 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "BuL6ndgaiJtjaM2T",
       "img": "icons/skills/melee/strike-slashes-orange.webp",
       "effects": [],
       "folder": null,
-      "sort": 0,
+      "sort": 300000,
       "ownership": {
         "default": 0,
         "MQSznptE5yLT7kj8": 3
@@ -482,14 +484,14 @@
       "name": "Mind Dance",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Mark a Stress</strong> to create a magically dazzling display that grapples the minds of nearby foes. All targets within Close range must make an Instinct Reaction Roll. For each target who failed, you gain a Fear and the Flickerfl y learns one of the target’s fears.</p><p>@Template[type:emanation|range:c]</p>",
+        "description": "<p><strong>Mark a Stress</strong> to create a magically dazzling display that grapples the minds of nearby foes. All targets within Close range must make an Instinct Reaction Roll. For each target who failed, you gain a Fear and the @Lookup[@name] learns one of the target’s fears.</p><p>@Template[type:emanation|range:c]</p>",
         "resource": null,
         "actions": {
           "GNwsDlCabx3fiG4g": {
             "type": "attack",
             "_id": "GNwsDlCabx3fiG4g",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to create a magically dazzling display that grapples the minds of nearby foes. All targets within Close range must make an Instinct Reaction Roll. For each target who failed, you gain a Fear and the Flickerfl y learns one of the target’s fears.</p><p>@Template[type:emanation|range:c]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -540,13 +542,14 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "bOTsfXr9yNIGkIzK",
       "img": "icons/magic/light/explosion-glow-spiral-yellow.webp",
       "effects": [],
       "folder": null,
-      "sort": 0,
+      "sort": 400000,
       "ownership": {
         "default": 0,
         "MQSznptE5yLT7kj8": 3
@@ -561,14 +564,14 @@
       "name": "Hallucinatory Breath",
       "type": "feature",
       "system": {
-        "description": "<p><em>Countdown (Loop 1d6)</em>. When the Flickerfly takes damage for the first time, activate the countdown. When it triggers, the Flickerfly breathes hallucinatory gas on all targets in front of them up to Far range. Targets must make an Instinct Reaction Roll or be tormented by fearful hallucinations. Targets whose fears are known to the Flickerfl y have disadvantage on this roll. Targets who fail lose 2 Hope and take <strong>3d8+3</strong> direct magic damage.</p><p>@Template[type:inFront|range:f]</p>",
+        "description": "<p><em>Countdown (Loop 1d6)</em>. When the @Lookup[@name] takes damage for the first time, activate the countdown. When it triggers, the @Lookup[@name] breathes hallucinatory gas on all targets in front of them up to Far range. Targets must make an Instinct Reaction Roll or be tormented by fearful hallucinations. Targets whose fears are known to the @Lookup[@name] have disadvantage on this roll. Targets who fail lose 2 Hope and take <strong>3d8+3</strong> direct magic damage.</p><p>@Template[type:inFront|range:f]</p>",
         "resource": null,
         "actions": {
           "YOyKyKGTUEWkMmJe": {
             "type": "attack",
             "_id": "YOyKyKGTUEWkMmJe",
             "systemPath": "actions",
-            "description": "<p>The Flickerfly breathes hallucinatory gas on all targets in front of them up to Far range. Targets must make an Instinct Reaction Roll or be tormented by fearful hallucinations. Targets whose fears are known to the Flickerfly have disadvantage on this roll. Targets who fail lose 2 Hope and take <strong>3d8+3</strong> direct magic damage.</p><p>@Template[type:inFront|range:f]</p>",
+            "description": "<p>The @Lookup[@name] breathes hallucinatory gas on all targets in front of them up to Far range. Targets must make an Instinct Reaction Roll or be tormented by fearful hallucinations. Targets whose fears are known to the @Lookup[@name] have disadvantage on this roll. Targets who fail lose 2 Hope and take <strong>3d8+3</strong> direct magic damage.</p><p>@Template[type:inFront|range:f]</p>",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -666,7 +669,7 @@
             "type": "countdown",
             "_id": "lBhmLc33pcXzJHT3",
             "systemPath": "actions",
-            "description": "<p><em>Countdown (Loop 1d6)</em>. When the Flickerfly takes damage for the first time, activate the countdown.</p>",
+            "description": "<p><em>Countdown (Loop 1d6)</em>. When the @Lookup[@name] takes damage for the first time, activate the countdown.</p>",
             "chatDisplay": true,
             "originItem": {
               "type": "itemCollection"
@@ -701,13 +704,14 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "49cIxZRFiAM6jDva",
       "img": "icons/magic/air/fog-gas-smoke-purple.webp",
       "effects": [],
       "folder": null,
-      "sort": 0,
+      "sort": 500000,
       "ownership": {
         "default": 0,
         "MQSznptE5yLT7kj8": 3
@@ -722,14 +726,14 @@
       "name": "Uncanny Reflexes",
       "type": "feature",
       "system": {
-        "description": "<p>When the Flickerfly takes damage from an attack within Close range, you can mark a Stress to take half damage.</p>",
+        "description": "<p>When the @Lookup[@name] takes damage from an attack within Close range, you can mark a Stress to take half damage.</p>",
         "resource": null,
         "actions": {
           "FocbilGTpvUjlb7m": {
             "type": "effect",
             "_id": "FocbilGTpvUjlb7m",
             "systemPath": "actions",
-            "description": "<p>When the Flickerfly takes damage from an attack within Close range, you can mark a Stress to take half damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "reaction",
             "cost": [
@@ -756,13 +760,14 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "KLdLRKoJHBJlHwYe",
       "img": "icons/skills/movement/arrow-upward-yellow.webp",
       "effects": [],
       "folder": null,
-      "sort": 0,
+      "sort": 600000,
       "ownership": {
         "default": 0,
         "MQSznptE5yLT7kj8": 3
@@ -777,7 +782,7 @@
       "name": "Deadly Flight",
       "type": "feature",
       "system": {
-        "description": "<p>While flying the Flickerfly can move up to Far range instead of Close range before taking an action.</p>",
+        "description": "<p>While flying the @Lookup[@name] can move up to Far range instead of Close range before taking an action.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -787,7 +792,7 @@
       "img": "icons/skills/movement/feet-winged-boots-blue.webp",
       "effects": [],
       "folder": null,
-      "sort": 0,
+      "sort": 700000,
       "ownership": {
         "default": 0,
         "fBcTgyTzoARBvohY": 3
diff --git a/src/packs/adversaries/adversary_Apprentice_Assassin_vNIbYQ4YSzNf0WPE.json b/src/packs/adversaries/adversary_Apprentice_Assassin_vNIbYQ4YSzNf0WPE.json
index 0fd791e0..3f31ff76 100644
--- a/src/packs/adversaries/adversary_Apprentice_Assassin_vNIbYQ4YSzNf0WPE.json
+++ b/src/packs/adversaries/adversary_Apprentice_Assassin_vNIbYQ4YSzNf0WPE.json
@@ -110,7 +110,8 @@
       "source": "Daggerheart SRD",
       "page": 84,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "vNIbYQ4YSzNf0WPE",
@@ -219,11 +220,12 @@
       "name": "Minion (6)",
       "type": "feature",
       "system": {
-        "description": "<p>The Assassin is defeated when they take any damage. For every 6 damage a PC deals to the Assassin, defeat an additional Minion within range the attack would succeed against.</p>",
+        "description": "<p>The @Lookup[@name] is defeated when they take any damage. For every 6 damage a PC deals to the @Lookup[@name], defeat an additional Minion within range the attack would succeed against.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "passive"
       },
       "_id": "2yREz60uPY80tAa4",
       "img": "icons/magic/symbols/runes-carved-stone-yellow.webp",
@@ -244,14 +246,14 @@
       "name": "Group Attack",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all Apprentice Assassins within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 4 physical damage each. Combine this damage.</p>",
+        "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all @Lookup[@name]s within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 4 physical damage each. Combine this damage.</p>",
         "resource": null,
         "actions": {
           "vgguNWz8vG8aoLXR": {
             "type": "effect",
             "_id": "vgguNWz8vG8aoLXR",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all Apprentice Assassins within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 4 physical damage each. Combine this damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -278,7 +280,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "4wT7CmM1DJEPcraF",
       "img": "icons/creatures/abilities/tail-strike-bone-orange.webp",
diff --git a/src/packs/adversaries/adversary_Arch_Necromancer_WPEOIGfclNJxWb87.json b/src/packs/adversaries/adversary_Arch_Necromancer_WPEOIGfclNJxWb87.json
index cbba184b..4fc58990 100644
--- a/src/packs/adversaries/adversary_Arch_Necromancer_WPEOIGfclNJxWb87.json
+++ b/src/packs/adversaries/adversary_Arch_Necromancer_WPEOIGfclNJxWb87.json
@@ -122,7 +122,8 @@
       "source": "Daggerheart SRD",
       "page": 97,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "WPEOIGfclNJxWb87",
@@ -238,7 +239,7 @@
             "type": "attack",
             "_id": "wi2DDvBhlg6sxQoc",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to spotlight <strong>1d4</strong> allies. Attacks they make while spotlighted in this way deal half damage, or full damage if you spend a Fear.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -289,7 +290,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "jNmMyq5QI2HNgffy",
       "img": "icons/magic/death/skull-weapon-staff-glow-pink.webp",
@@ -317,7 +319,7 @@
             "type": "attack",
             "_id": "vaXLESD4sRkQ3Ahn",
             "systemPath": "actions",
-            "description": "<p><strong>Mark 2 Stress</strong> to cause all targets within Far range to make a Strength Reaction Roll. Targets who fail take <strong>2d20+12</strong> magic damage and you gain a Fear. Targets who succeed take half damage. A target who marks 2 or more HP must also <strong>mark 2 Stress</strong> and becomes <em>Vulnerable</em> until they roll with Hope.</p><p>@Template[type:emanation|range:f]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -467,7 +469,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "4EECsXzHFG0RoIg0",
       "img": "icons/magic/unholy/projectile-missile-green.webp",
@@ -534,7 +537,7 @@
             "type": "effect",
             "_id": "gZg3AkzCYUTExjE6",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to summon a @UUID[Compendium.daggerheart.adversaries.Actor.YhJrP7rTBiRdX5Fp]{Zombie Legion}, which appears at Close range and immediately takes the spotlight.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -561,7 +564,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "XxXOrFovbCz9zFxR",
       "img": "icons/magic/death/undead-zombie-grave-green.webp",
@@ -582,14 +586,14 @@
       "name": "Not Today, My Dears",
       "type": "feature",
       "system": {
-        "description": "<p>When the Necromancer has marked 7 or more of their HP, you can <strong>spend a Fear</strong> to have them teleport away to a safe location to recover. A PC who succeeds on an Instinct Roll can trace the teleportation magic to their destination.</p>",
+        "description": "<p>When the @Lookup[@name] has marked 7 or more of their HP, you can <strong>spend a Fear</strong> to have them teleport away to a safe location to recover. A PC who succeeds on an Instinct Roll can trace the teleportation magic to their destination.</p>",
         "resource": null,
         "actions": {
           "DX8WPeLVrRBB2CdM": {
             "type": "attack",
             "_id": "DX8WPeLVrRBB2CdM",
             "systemPath": "actions",
-            "description": "<p>When the Necromancer has marked 7 or more of their HP, you can <strong>spend a Fear</strong> to have them teleport away to a safe location to recover. A PC who succeeds on an Instinct Roll can trace the teleportation magic to their destination.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -640,7 +644,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "k4MSykLRoW3qp7Lk",
       "img": "icons/magic/death/skull-horned-worn-fire-blue.webp",
@@ -661,14 +666,14 @@
       "name": "Your Life Is Mine",
       "type": "feature",
       "system": {
-        "description": "<p><em>Countdown (Loop 2d6)</em>. When the Necromancer has marked 6 or more of their HP, activate the countdown. When it triggers, deal <strong>2d10+6</strong> direct magic damage to a target within Close range. The Necromancer then <strong>clears a number of Stress or HP</strong> equal to the number of HP marked by the target from this attack.</p>",
+        "description": "<p><em>Countdown (Loop 2d6)</em>. When the @Lookup[@name] has marked 6 or more of their HP, activate the countdown. When it triggers, deal <strong>2d10+6</strong> direct magic damage to a target within Close range. The @Lookup[@name] then <strong>clears a number of Stress or HP</strong> equal to the number of HP marked by the target from this attack.</p>",
         "resource": null,
         "actions": {
           "YzepYov9vEMcBPU1": {
             "type": "damage",
             "_id": "YzepYov9vEMcBPU1",
             "systemPath": "actions",
-            "description": "<p>Deal <strong>2d10+6</strong> direct magic damage to a target within Close range. The Necromancer then <strong>clears a number of Stress or HP</strong> equal to the number of HP marked by the target from this attack.</p>",
+            "description": "<p>Deal <strong>2d10+6</strong> direct magic damage to a target within Close range. The @Lookup[@name] then <strong>clears a number of Stress or HP</strong> equal to the number of HP marked by the target from this attack.</p>",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -721,7 +726,7 @@
             "type": "countdown",
             "_id": "LXhwkNCDFeUric8D",
             "systemPath": "actions",
-            "description": "<p><em>Countdown (Loop 2d6)</em>. When the Necromancer has marked 6 or more of their HP, activate the countdown.</p>",
+            "description": "<p><em>Countdown (Loop 2d6)</em>. When the @Lookup[@name] has marked 6 or more of their HP, activate the countdown.</p>",
             "chatDisplay": true,
             "originItem": {
               "type": "itemCollection"
@@ -756,7 +761,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "FKcuCo0v2U7fVkqq",
       "img": "icons/magic/unholy/hand-claw-fire-green.webp",
diff --git a/src/packs/adversaries/adversary_Archer_Guard_JRhrrEg5UroURiAD.json b/src/packs/adversaries/adversary_Archer_Guard_JRhrrEg5UroURiAD.json
index f4520545..5a13b3d9 100644
--- a/src/packs/adversaries/adversary_Archer_Guard_JRhrrEg5UroURiAD.json
+++ b/src/packs/adversaries/adversary_Archer_Guard_JRhrrEg5UroURiAD.json
@@ -39,7 +39,8 @@
     "experiences": {
       "Gtr9I2G39GcXT2Si": {
         "name": "Local Knowledge",
-        "value": 3
+        "value": 3,
+        "description": ""
       }
     },
     "bonuses": {
@@ -116,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 77,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "JRhrrEg5UroURiAD",
@@ -234,7 +236,7 @@
             "type": "attack",
             "_id": "84rwldOFvTPrrHJJ",
             "systemPath": "actions",
-            "description": "<p>Make an attack against a target within Far range. On a success, <strong>mark a Stress</strong> to deal <strong>1d12+3</strong> physical damage. If the target marks HP from this attack, they have disadvantage on Agility Rolls until they clear at least 1 HP.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -311,7 +313,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [
         {
diff --git a/src/packs/adversaries/adversary_Archer_Squadron_0ts6CGd93lLqGZI5.json b/src/packs/adversaries/adversary_Archer_Squadron_0ts6CGd93lLqGZI5.json
index 00b2462a..55229040 100644
--- a/src/packs/adversaries/adversary_Archer_Squadron_0ts6CGd93lLqGZI5.json
+++ b/src/packs/adversaries/adversary_Archer_Squadron_0ts6CGd93lLqGZI5.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 84,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "0ts6CGd93lLqGZI5",
@@ -220,7 +221,7 @@
       "name": "Horde (1d6+3)",
       "type": "feature",
       "system": {
-        "description": "<p>When the Squadron has marked half or more of their HP, their standard attack deals <strong>1d6+3</strong> physical damage instead.</p>",
+        "description": "<p>When the @Lookup[@name] has marked half or more of their HP, their standard attack deals <strong>1d6+3</strong> physical damage instead.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -245,14 +246,14 @@
       "name": "Focused Volley",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Spend a Fear</strong> to target a point within Far range. Make an attack with advantage against all targets within Close range of that point. Targets the Squadron succeeds against take <strong>1d10+4</strong> physical damage.</p><p>@Template[type:circle|range:c]</p>",
+        "description": "<p><strong>Spend a Fear</strong> to target a point within Far range. Make an attack with advantage against all targets within Close range of that point. Targets the @Lookup[@name] succeeds against take <strong>1d10+4</strong> physical damage.</p><p>@Template[type:circle|range:c]</p>",
         "resource": null,
         "actions": {
           "uG7Hl2DqaT69aNs1": {
             "type": "attack",
             "_id": "uG7Hl2DqaT69aNs1",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to target a point within Far range. Make an attack with advantage against all targets within Close range of that point. Targets the Squadron succeeds against take <strong>1d10+4</strong> physical damage.</p><p>@Template[type:circle|range:c]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -328,7 +329,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "Wuf5y9tJ88BwzLv2",
       "img": "icons/skills/ranged/arrows-flying-triple-brown.webp",
@@ -356,7 +358,7 @@
             "type": "attack",
             "_id": "mH6mmJIMM1fwzePt",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to target a point within Far range. Until the next roll with Fear, a creature who moves within Close range of that point must make an Agility Reaction Roll. On a failure, they take <strong>2d6+3</strong> physical damage. On a success, they take half damage.</p><p>@Template[type:circle|range:c]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -425,7 +427,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "ayGHTtyjSuIR4BrV",
       "img": "icons/skills/ranged/arrows-flying-salvo-blue.webp",
diff --git a/src/packs/adversaries/adversary_Assassin_Poisoner_h5RuhzGL17dW5FBT.json b/src/packs/adversaries/adversary_Assassin_Poisoner_h5RuhzGL17dW5FBT.json
index e887b4ba..6594cbbe 100644
--- a/src/packs/adversaries/adversary_Assassin_Poisoner_h5RuhzGL17dW5FBT.json
+++ b/src/packs/adversaries/adversary_Assassin_Poisoner_h5RuhzGL17dW5FBT.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 84,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "h5RuhzGL17dW5FBT",
@@ -226,14 +227,14 @@
       "name": "Grindletooth Venom",
       "type": "feature",
       "system": {
-        "description": "<p>Targets who mark HP from the Assassin’s attacks are Vulnerable until they clear a HP.</p>",
+        "description": "<p>Targets who mark HP from the @Lookup[@name]’s attacks are Vulnerable until they clear a HP.</p>",
         "resource": null,
         "actions": {
           "L83tU1TgmqoH9SSn": {
             "type": "effect",
             "_id": "L83tU1TgmqoH9SSn",
             "systemPath": "actions",
-            "description": "<p>Targets who mark HP from the Assassin’s attacks are Vulnerable until they clear a HP.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -318,7 +319,7 @@
       "name": "Assassin Poisoner",
       "type": "feature",
       "system": {
-        "description": "<p>The Assassin has advantage on attacks if they are <em>Hidden</em>.</p>",
+        "description": "<p>The @Lookup[@name] has advantage on attacks if they are <em>Hidden</em>.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -394,7 +395,7 @@
             "type": "effect",
             "_id": "sp7RfJRQJsEUm09m",
             "systemPath": "actions",
-            "description": "<p>Drop a smoke bomb that fills the air within Close range with smoke, Dizzying all targets in this area. Dizzied targets have disadvantage on their next action roll, then clear the condition.</p><p>@Template[type:emanation|range:c]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -419,7 +420,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "lAmiK8wVxjyHwKlp",
       "img": "icons/magic/air/fog-gas-smoke-green.webp",
diff --git a/src/packs/adversaries/adversary_Battle_Box_dgH3fW9FTYLaIDvS.json b/src/packs/adversaries/adversary_Battle_Box_dgH3fW9FTYLaIDvS.json
index 49982ae2..96a1b752 100644
--- a/src/packs/adversaries/adversary_Battle_Box_dgH3fW9FTYLaIDvS.json
+++ b/src/packs/adversaries/adversary_Battle_Box_dgH3fW9FTYLaIDvS.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 85,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "_id": "dgH3fW9FTYLaIDvS",
@@ -226,14 +227,14 @@
       "name": "Relentless (2)",
       "type": "feature",
       "system": {
-        "description": "<p>The Box can be spotlighted up to two times times per GM turn. Spend Fear as usual to spotlight them.</p>",
+        "description": "<p>The @Lookup[@name] can be spotlighted up to two times times per GM turn. Spend Fear as usual to spotlight them.</p>",
         "resource": null,
         "actions": {
           "2JfPSV3pw6pv0BXd": {
             "type": "effect",
             "_id": "2JfPSV3pw6pv0BXd",
             "systemPath": "actions",
-            "description": "<p>The Box can be spotlighted up to two times times per GM turn. Spend Fear as usual to spotlight them.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "passive",
             "cost": [
@@ -284,14 +285,14 @@
       "name": "Randomized Tactics",
       "type": "feature",
       "system": {
-        "description": "<p>Mark a Stress and roll a <strong>d6</strong>. The Box uses the corresponding move:</p><ol><li><p><strong>Mana Beam</strong></p></li><li><p><strong>Fire Jets</strong></p></li><li><p><strong>Trample</strong></p></li><li><p><strong>Shocking Gas</strong></p></li><li><p><strong>Stunning Clap</strong></p></li><li><p><strong>Psionic Whine</strong></p></li></ol>",
+        "description": "<p>Mark a Stress and roll a <strong>d6</strong>. The @Lookup[@name] uses the corresponding move:</p><ol><li><p><strong>Mana Beam</strong></p></li><li><p><strong>Fire Jets</strong></p></li><li><p><strong>Trample</strong></p></li><li><p><strong>Shocking Gas</strong></p></li><li><p><strong>Stunning Clap</strong></p></li><li><p><strong>Psionic Whine</strong></p></li></ol>",
         "resource": null,
         "actions": {
           "FX9jwg5ZNjAWnti3": {
             "type": "attack",
             "_id": "FX9jwg5ZNjAWnti3",
             "systemPath": "actions",
-            "description": "<p>Mark a Stress and roll a <strong>d6</strong>. The Box uses the corresponding move:</p><ol><li><p><strong>Mana Beam</strong></p></li><li><p><strong>Fire Jets</strong></p></li><li><p><strong>Trample</strong></p></li><li><p><strong>Shocking Gas</strong></p></li><li><p><strong>Stunning Clap</strong></p></li><li><p><strong>Psionic Whine</strong></p></li></ol>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -342,7 +343,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "ZqfLMjVkbUwDw4p6",
       "img": "icons/commodities/tech/transmission.webp",
@@ -363,14 +365,14 @@
       "name": "Mana Beam",
       "type": "feature",
       "system": {
-        "description": "<p>The Box fires a searing beam. Make an attack against a target within Far range. On a success, deal <strong>2d10+2</strong> magic damage. </p>",
+        "description": "<p>The @Lookup[@name] fires a searing beam. Make an attack against a target within Far range. On a success, deal <strong>2d10+2</strong> magic damage.</p>",
         "resource": null,
         "actions": {
           "Co09oXMw0yBjGaws": {
             "type": "attack",
             "_id": "Co09oXMw0yBjGaws",
             "systemPath": "actions",
-            "description": "<p>The Box fires a searing beam. Make an attack against a target within Far range. On a success, deal <strong>2d10+2</strong> magic damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -441,7 +443,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "lqyN4CQop53BzarW",
       "img": "icons/magic/light/beam-rays-blue.webp",
@@ -462,14 +465,14 @@
       "name": "Fire Jets",
       "type": "feature",
       "system": {
-        "description": "<p>The Box shoots into the air, spinning and releasing jets of flame. Make an attack against all targets within Close range. Targets the Box succeeds against take <strong>2d8</strong> physical damage.</p><p>@Template[type:emanation|range:c]</p>",
+        "description": "<p>The @Lookup[@name] shoots into the air, spinning and releasing jets of flame. Make an attack against all targets within Close range. Targets the @Lookup[@name] succeeds against take <strong>2d8</strong> physical damage.</p><p>@Template[type:emanation|range:c]</p>",
         "resource": null,
         "actions": {
           "hRAKaOdzQXLYBNVV": {
             "type": "attack",
             "_id": "hRAKaOdzQXLYBNVV",
             "systemPath": "actions",
-            "description": "<p>The Box shoots into the air, spinning and releasing jets of flame. Make an attack against all targets within Close range. Targets the Box succeeds against take <strong>2d8</strong> physical damage.</p><p>@Template[type:emanation|range:c]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -540,7 +543,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "IHQoqt39T772FVMs",
       "img": "icons/magic/fire/explosion-embers-orange.webp",
@@ -561,14 +565,14 @@
       "name": "Trample",
       "type": "feature",
       "system": {
-        "description": "<p>The Box rockets around erratically. Make an attack against all PCs within Close range. Targets the Box succeeds against take <strong>1d6+5</strong> physical damage and are Vulnerable until their next roll with Hope. </p><p>@Template[type:emanation|range:c]</p>",
+        "description": "<p>The @Lookup[@name] rockets around erratically. Make an attack against all PCs within Close range. Targets the @Lookup[@name] succeeds against take <strong>1d6+5</strong> physical damage and are Vulnerable until their next roll with Hope.</p><p>@Template[type:emanation|range:c]</p>",
         "resource": null,
         "actions": {
           "IOgPMu12Xnn33TfG": {
             "type": "attack",
             "_id": "IOgPMu12Xnn33TfG",
             "systemPath": "actions",
-            "description": "<p>The Box rockets around erratically. Make an attack against all PCs within Close range. Targets the Box succeeds against take <strong>1d6+5</strong> physical damage and are Vulnerable until their next roll with Hope.</p><p>@Template[type:emanation|range:c]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -644,7 +648,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "XtnByqUr9AuYU9Ip",
       "img": "icons/skills/movement/arrow-upward-yellow.webp",
@@ -704,14 +709,14 @@
       "name": "Shocking Gas",
       "type": "feature",
       "system": {
-        "description": "<p>The Box sprays out a silver gas sparking with lightning. All targets within Close range must succeed on a Finesse Reaction Roll or mark 3 Stress. </p><p>@Template[type:emanation|range:c]</p>",
+        "description": "<p>The @Lookup[@name] sprays out a silver gas sparking with lightning. All targets within Close range must succeed on a Finesse Reaction Roll or mark 3 Stress.</p><p>@Template[type:emanation|range:c]</p>",
         "resource": null,
         "actions": {
           "ky4OMl558J5wCbDp": {
             "type": "attack",
             "_id": "ky4OMl558J5wCbDp",
             "systemPath": "actions",
-            "description": "<p>The Box sprays out a silver gas sparking with lightning. All targets within Close range must succeed on a Finesse Reaction Roll or mark 3 Stress.</p><p>@Template[type:emanation|range:c]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -781,7 +786,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "3bPURmuwQs06fThQ",
       "img": "icons/magic/lightning/bolt-strike-embers-teal.webp",
@@ -802,14 +808,14 @@
       "name": "Stunning Clap",
       "type": "feature",
       "system": {
-        "description": "<p>The Box leaps and their sides clap, creating a small sonic boom. All targets within Very Close range must succeed on a Strength Reaction Roll or become <em>Vulnerable</em> until the cube is defeated.</p><p>@Template[type:emanation|range:vc]</p>",
+        "description": "<p>The @Lookup[@name] leaps and their sides clap, creating a small sonic boom. All targets within Very Close range must succeed on a Strength Reaction Roll or become <em>Vulnerable</em> until the cube is defeated.</p><p>@Template[type:emanation|range:vc]</p>",
         "resource": null,
         "actions": {
           "LQtopkrtSlCQ5MAr": {
             "type": "attack",
             "_id": "LQtopkrtSlCQ5MAr",
             "systemPath": "actions",
-            "description": "<p>The Box leaps and their sides clap, creating a small sonic boom. All targets within Very Close range must succeed on a Strength Reaction Roll or become <em>Vulnerable</em> until the cube is defeated.</p><p>@Template[type:emanation|range:vc]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -858,7 +864,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "ijIaKjroxq3xZd9Z",
       "img": "icons/magic/sonic/explosion-impact-shock-wave.webp",
@@ -918,14 +925,14 @@
       "name": "Psionic Whine",
       "type": "feature",
       "system": {
-        "description": "<p>The Box releases a cluster of mechanical bees whose buzz rattles mortal minds. All targets within Close range must succeed on a Presence Reaction Roll or take <strong>2d4+9</strong> direct magic damage.</p><p>@Template[type:emanation|range:c]</p>",
+        "description": "<p>The @Lookup[@name] releases a cluster of mechanical bees whose buzz rattles mortal minds. All targets within Close range must succeed on a Presence Reaction Roll or take <strong>2d4+9</strong> direct magic damage.</p><p>@Template[type:emanation|range:c]</p>",
         "resource": null,
         "actions": {
           "3R3pGOUj4rHaUzPK": {
             "type": "attack",
             "_id": "3R3pGOUj4rHaUzPK",
             "systemPath": "actions",
-            "description": "<p>The Box releases a cluster of mechanical bees whose buzz rattles mortal minds. All targets within Close range must succeed on a Presence Reaction Roll or take <strong>2d4+9</strong> direct magic damage.</p><p>@Template[type:emanation|range:c]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -996,7 +1003,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "JCue4ko61bjhedXv",
       "img": "icons/creatures/invertebrates/wasp-swarm-tan.webp",
@@ -1017,14 +1025,14 @@
       "name": "Overcharge",
       "type": "feature",
       "system": {
-        "description": "<p>Before rolling damage for the Box’s attack, you can <strong>mark a Stress</strong> to add a <strong>d6</strong> to the damage roll. Additionally, you gain a Fear.</p>",
+        "description": "<p>Before rolling damage for the @Lookup[@name]’s attack, you can <strong>mark a Stress</strong> to add a <strong>d6</strong> to the damage roll. Additionally, you gain a Fear.</p>",
         "resource": null,
         "actions": {
           "3XOvKoYz4CqMNrU9": {
             "type": "healing",
             "_id": "3XOvKoYz4CqMNrU9",
             "systemPath": "actions",
-            "description": "<p>Before rolling damage for the Box’s attack, you can <strong>mark a Stress</strong> to add a <strong>d6</strong> to the damage roll. Additionally, you gain a Fear.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -1096,7 +1104,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "ITzpRJr2jWK0Ksmp",
       "img": "icons/creatures/magical/construct-golem-stone-blue.webp",
@@ -1117,14 +1126,14 @@
       "name": "Death Quake",
       "type": "feature",
       "system": {
-        "description": "<p>When the Box marks their last HP, the magic powering them ruptures in an explosion of force. All targets within Close range must succeed on an Instinct Reaction Roll or take <strong>2d8+1</strong> magic damage</p><p>@Template[type:emanation|range:c]</p>",
+        "description": "<p>When the @Lookup[@name] marks their last HP, the magic powering them ruptures in an explosion of force. All targets within Close range must succeed on an Instinct Reaction Roll or take <strong>2d8+1</strong> magic damage</p><p>@Template[type:emanation|range:c]</p>",
         "resource": null,
         "actions": {
           "oCpv4zi9jtEpo0K1": {
             "type": "attack",
             "_id": "oCpv4zi9jtEpo0K1",
             "systemPath": "actions",
-            "description": "<p>When the Box marks their last HP, the magic powering them ruptures in an explosion of force. All targets within Close range must succeed on an Instinct Reaction Roll or take <strong>2d8+1</strong> magic damage</p><p>@Template[type:emanation|range:c]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -1195,7 +1204,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "YvfzPyJbbv2ia6Yp",
       "img": "icons/magic/sonic/explosion-shock-wave-teal.webp",
diff --git a/src/packs/adversaries/adversary_Bear_71qKDLKO3CsrNkdy.json b/src/packs/adversaries/adversary_Bear_71qKDLKO3CsrNkdy.json
index e902ac32..da5de611 100644
--- a/src/packs/adversaries/adversary_Bear_71qKDLKO3CsrNkdy.json
+++ b/src/packs/adversaries/adversary_Bear_71qKDLKO3CsrNkdy.json
@@ -122,7 +122,8 @@
       "source": "Daggerheart SRD",
       "page": 75,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "_id": "71qKDLKO3CsrNkdy",
@@ -233,7 +234,7 @@
       "_id": "2fXzhh2qil8dw3vw",
       "img": "icons/skills/melee/strike-slashes-orange.webp",
       "system": {
-        "description": "<p>Targets who mark HP from the Bear’s standard attack are knocked back to Very Close range.</p>",
+        "description": "<p>Targets who mark HP from the @Lookup[@name]’s standard attack are knocked back to Very Close range.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -266,7 +267,7 @@
             "type": "attack",
             "_id": "PXL3e51eBYZ4O2lb",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to make an attack against a target within Melee range. On a success, deal <strong>3d4+10</strong> physical damage and the target is <em>Restrained</em> until they break free with a successful Strength Roll.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -350,7 +351,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [
         {
@@ -485,7 +487,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "effects": [],
       "folder": null,
diff --git a/src/packs/adversaries/adversary_Bladed_Guard_B4LZcGuBAHzyVdzy.json b/src/packs/adversaries/adversary_Bladed_Guard_B4LZcGuBAHzyVdzy.json
index 24194f3d..8ee7c56c 100644
--- a/src/packs/adversaries/adversary_Bladed_Guard_B4LZcGuBAHzyVdzy.json
+++ b/src/packs/adversaries/adversary_Bladed_Guard_B4LZcGuBAHzyVdzy.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 77,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "B4LZcGuBAHzyVdzy",
@@ -228,14 +229,14 @@
       "_id": "qEn4baWgkjKtmILp",
       "img": "icons/equipment/shield/shield-round-boss-wood-brown.webp",
       "system": {
-        "description": "<p>A creature who tries to move within Very Close range of the Guard must succeed on an Agility Roll. If additional Bladed Guards are standing in a line alongside the first, and each is within Melee range of another guard in the line, the Difficulty increases by the total number of guards in that line.</p>",
+        "description": "<p>A creature who tries to move within Very Close range of the @Lookup[@name] must succeed on an Agility Roll. If additional @Lookup[@name]s are standing in a line alongside the first, and each is within Melee range of another guard in the line, the Difficulty increases by the total number of guards in that line.</p>",
         "resource": null,
         "actions": {
           "3lbeEeJdjzPn0MoG": {
             "type": "attack",
             "_id": "3lbeEeJdjzPn0MoG",
             "systemPath": "actions",
-            "description": "<p>A creature who tries to move within Very Close range of the Guard must succeed on an Agility Roll. If additional Bladed Guards are standing in a line alongside the first, and each is within Melee range of another guard in the line, the Difficulty increases by the total number of guards in that line.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "passive",
             "cost": [],
@@ -308,7 +309,7 @@
             "type": "attack",
             "_id": "TK5R00afB1RIA6gp",
             "systemPath": "actions",
-            "description": "<p>Make an attack against a target within Very Close range. On a success, <strong>mark a Stress</strong> to Restrain the target until they break free with a successful attack, Finesse Roll, or Strength Roll.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -358,7 +359,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [
         {
diff --git a/src/packs/adversaries/adversary_Brawny_Zombie_2UeZ0tEe7AzgSJNd.json b/src/packs/adversaries/adversary_Brawny_Zombie_2UeZ0tEe7AzgSJNd.json
index cf6583e4..c829c3f9 100644
--- a/src/packs/adversaries/adversary_Brawny_Zombie_2UeZ0tEe7AzgSJNd.json
+++ b/src/packs/adversaries/adversary_Brawny_Zombie_2UeZ0tEe7AzgSJNd.json
@@ -120,7 +120,8 @@
       "source": "Daggerheart SRD",
       "page": 83,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "2UeZ0tEe7AzgSJNd",
@@ -231,7 +232,7 @@
       "_id": "yBaLF9DwPH2GSRKf",
       "img": "icons/magic/time/hourglass-brown-orange.webp",
       "system": {
-        "description": "<p>When you spotlight the Zombie and they don’t have a token on their stat block, they can’t act yet. Place a token on their stat block and describe what they’re preparing to do. When you spotlight the Zombie and they have a token on their stat block, clear the token and they can act.</p>",
+        "description": "<p>When you spotlight the @Lookup[@name] and they don’t have a token on their stat block, they can’t act yet. Place a token on their stat block and describe what they’re preparing to do. When you spotlight the @Lookup[@name] and they have a token on their stat block, clear the token and they can act.</p>",
         "resource": {
           "type": "simple",
           "value": 0,
@@ -262,14 +263,14 @@
       "_id": "LP7xVLMTkJsmiIvl",
       "img": "icons/skills/melee/strike-slashes-red.webp",
       "system": {
-        "description": "<p>Make a standard attack with advantage against a target the Zombie has <em>Restrained</em>. On a success, the attack deals direct damage.</p>",
+        "description": "<p>Make a standard attack with advantage against a target the @Lookup[@name] has <em>Restrained</em>. On a success, the attack deals direct damage.</p>",
         "resource": null,
         "actions": {
           "qCcWw60cPZnEWbpG": {
             "type": "attack",
             "_id": "qCcWw60cPZnEWbpG",
             "systemPath": "actions",
-            "description": "<p>Make a standard attack with advantage against a target the Zombie has <em>Restrained</em>. On a success, the attack deals direct damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -342,7 +343,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
@@ -363,14 +365,14 @@
       "_id": "69reUZ5tv3splqyO",
       "img": "icons/creatures/abilities/mouth-teeth-lamprey-red.webp",
       "system": {
-        "description": "<p>When the Zombies makes a successful standard attack, you can <strong>mark a Stress</strong> to temporarily Restrain the target and force them to mark 2 Stress.</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful standard attack, you can <strong>mark a Stress</strong> to temporarily Restrain the target and force them to mark 2 Stress.</p>",
         "resource": null,
         "actions": {
           "xV1z3dk9c7jIkk7v": {
             "type": "damage",
             "_id": "xV1z3dk9c7jIkk7v",
             "systemPath": "actions",
-            "description": "<p>When the Zombies makes a successful standard attack, you can <strong>mark a Stress</strong> to temporarily Restrain the target and force them to mark 2 Stress.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -433,7 +435,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "effects": [
         {
diff --git a/src/packs/adversaries/adversary_Cave_Ogre_8Zkqk1jU09nKL2fy.json b/src/packs/adversaries/adversary_Cave_Ogre_8Zkqk1jU09nKL2fy.json
index fd73ee36..5b2d2e41 100644
--- a/src/packs/adversaries/adversary_Cave_Ogre_8Zkqk1jU09nKL2fy.json
+++ b/src/packs/adversaries/adversary_Cave_Ogre_8Zkqk1jU09nKL2fy.json
@@ -118,7 +118,8 @@
       "source": "Daggerheart SRD",
       "page": 75,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "_id": "8Zkqk1jU09nKL2fy",
@@ -229,14 +230,14 @@
       "_id": "ynuyMl1sMQYINfcQ",
       "img": "icons/weapons/clubs/club-spiked-glowing.webp",
       "system": {
-        "description": "<p>You must <strong>spend a Fear</strong> to spotlight the Ogre. While spotlighted, they can make their standard attack against all targets within range.</p>",
+        "description": "<p>You must <strong>spend a Fear</strong> to spotlight the @Lookup[@name]. While spotlighted, they can make their standard attack against all targets within range.</p>",
         "resource": null,
         "actions": {
           "UoZ6vXRXvWYjpJpZ": {
             "type": "effect",
             "_id": "UoZ6vXRXvWYjpJpZ",
             "systemPath": "actions",
-            "description": "<p>You must <strong>spend a Fear</strong> to spotlight the Ogre. While spotlighted, they can make their standard attack against all targets within range.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -285,7 +286,7 @@
       "_id": "szu5YYQ6klkDbqAT",
       "img": "icons/skills/wounds/bone-broken-marrow-red.webp",
       "system": {
-        "description": "<p>The Ogre’s attacks deal direct damage.</p>",
+        "description": "<p>The @Lookup[@name]’s attacks deal direct damage.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -311,14 +312,14 @@
       "_id": "zGvaBYJPOOnQVQEn",
       "img": "icons/magic/earth/projectile-stone-boulder-orange.webp",
       "system": {
-        "description": "<p><strong>Mark a Stress</strong> to pick up heavy objects and throw them at all targets in front of the Ogre within Far range. Make an attack against these targets. Targets the Ogre succeeds against take <strong>1d10+2</strong> physical damage. If they succeed against more than one target, you gain a Fear.</p><p>@Template[type:inFront|range:f]</p>",
+        "description": "<p><strong>Mark a Stress</strong> to pick up heavy objects and throw them at all targets in front of the @Lookup[@name] within Far range. Make an attack against these targets. Targets the @Lookup[@name] succeeds against take <strong>1d10+2</strong> physical damage. If they succeed against more than one target, you gain a Fear.</p><p>@Template[type:inFront|range:f]</p>",
         "resource": null,
         "actions": {
           "3p1qfHy5uHe4H2hB": {
             "type": "attack",
             "_id": "3p1qfHy5uHe4H2hB",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to pick up heavy objects and throw them at all targets in front of the Ogre within Far range. Make an attack against these targets. Targets the Ogre succeeds against take <strong>1d10+2</strong> physical damage. If they succeed against more than one target, you gain a Fear.</p><p>@Template[type:inFront|range:f]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -467,7 +468,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
@@ -488,14 +490,14 @@
       "_id": "Qxkddj6nQc4RDExW",
       "img": "icons/skills/melee/strike-flail-destructive-yellow.webp",
       "system": {
-        "description": "<p>When the Ogre marks 2 or more HP, they can rampage. Move the Ogre to a point within Close range and deal <strong>2d6+3</strong> direct physical damage to all targets in their path.</p>",
+        "description": "<p>When the @Lookup[@name] marks 2 or more HP, they can rampage. Move the @Lookup[@name] to a point within Close range and deal <strong>2d6+3</strong> direct physical damage to all targets in their path.</p>",
         "resource": null,
         "actions": {
           "PtTu9bnCJKMySBSV": {
             "type": "damage",
             "_id": "PtTu9bnCJKMySBSV",
             "systemPath": "actions",
-            "description": "<p>When the Ogre marks 2 or more HP, they can rampage. Move the Ogre to a point within Close range and deal <strong>2d6+3</strong> direct physical damage to all targets in their path.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -548,7 +550,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "effects": [],
       "folder": null,
diff --git a/src/packs/adversaries/adversary_Chaos_Skull_jDmHqGvzg5wjgmxE.json b/src/packs/adversaries/adversary_Chaos_Skull_jDmHqGvzg5wjgmxE.json
index a9686bf0..f548870a 100644
--- a/src/packs/adversaries/adversary_Chaos_Skull_jDmHqGvzg5wjgmxE.json
+++ b/src/packs/adversaries/adversary_Chaos_Skull_jDmHqGvzg5wjgmxE.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 85,
       "artist": ""
-    }
+    },
+    "size": "tiny"
   },
   "flags": {},
   "_id": "jDmHqGvzg5wjgmxE",
@@ -220,7 +221,7 @@
       "name": "Levitation",
       "type": "feature",
       "system": {
-        "description": "<p>The Skull levitates several feet off the ground and can’t be <em>Restrained</em>.</p>",
+        "description": "<p>The @Lookup[@name] levitates several feet off the ground and can’t be <em>Restrained</em>.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -289,7 +290,7 @@
       "name": "Wards",
       "type": "feature",
       "system": {
-        "description": "<p> The Skull is resistant to magic damage.</p>",
+        "description": "<p>The @Lookup[@name] is resistant to magic damage.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -358,14 +359,14 @@
       "name": "Magic Burst",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Mark a Stress</strong> to make an attack against all targets within Close range. Targets the Skull succeeds against take <strong>2d6+4</strong> magic damage.</p><p>@Template[type:emanation|range:c]</p>",
+        "description": "<p><strong>Mark a Stress</strong> to make an attack against all targets within Close range. Targets the @Lookup[@name] succeeds against take <strong>2d6+4</strong> magic damage.</p><p>@Template[type:emanation|range:c]</p>",
         "resource": null,
         "actions": {
           "iF0PD1t3yovKMTfy": {
             "type": "attack",
             "_id": "iF0PD1t3yovKMTfy",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to make an attack against all targets within Close range. Targets the Skull succeeds against take <strong>2d6+4</strong> magic damage.</p><p>@Template[type:emanation|range:c]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -443,7 +444,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "Zn25zBr96y1hrmnr",
       "img": "icons/magic/lightning/bolt-strike-purple.webp",
@@ -464,14 +466,14 @@
       "name": "Siphon Magic",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Spend a Fear</strong> to make an attack against a PC with a Spellcast trait within Very Close range. On a success, the target marks <strong>1d4</strong> Stress and the Skull clears that many Stress. Additionally, on a success, the Skull can immediately be spotlighted again.</p>",
+        "description": "<p><strong>Spend a Fear</strong> to make an attack against a PC with a Spellcast trait within Very Close range. On a success, the target marks <strong>1d4</strong> Stress and the @Lookup[@name] clears that many Stress. Additionally, on a success, the @Lookup[@name] can immediately be spotlighted again.</p>",
         "resource": null,
         "actions": {
           "872Fq88Hitwc6f3W": {
             "type": "attack",
             "_id": "872Fq88Hitwc6f3W",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to make an attack against a PC with a Spellcast trait within Very Close range. On a success, the target marks <strong>1d4</strong> Stress and the Skull clears that many Stress. Additionally, on a success, the Skull can immediately be spotlighted again.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -540,7 +542,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "urXRi4bdBfvl8U6K",
       "img": "icons/magic/control/sihouette-hold-beam-green.webp",
diff --git a/src/packs/adversaries/adversary_Conscript_99TqczuQipBmaB8i.json b/src/packs/adversaries/adversary_Conscript_99TqczuQipBmaB8i.json
index bf302c3f..c5b4357d 100644
--- a/src/packs/adversaries/adversary_Conscript_99TqczuQipBmaB8i.json
+++ b/src/packs/adversaries/adversary_Conscript_99TqczuQipBmaB8i.json
@@ -104,7 +104,8 @@
       "source": "Daggerheart SRD",
       "page": 85,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "99TqczuQipBmaB8i",
@@ -213,7 +214,7 @@
       "name": "Minion (6)",
       "type": "feature",
       "system": {
-        "description": "<p>The Conscript is defeated when they take any damage. For every 6 damage a PC deals to the Conscript, defeat an additional Minion within range the attack would succeed against.</p>",
+        "description": "<p>The @Lookup[@name] is defeated when they take any damage. For every 6 damage a PC deals to the @Lookup[@name], defeat an additional Minion within range the attack would succeed against.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -238,14 +239,14 @@
       "name": "Group Attack",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all Conscripts within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 6 physical damage each. Combine this damage.</p>",
+        "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all @Lookup[@name]s within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 6 physical damage each. Combine this damage.</p>",
         "resource": null,
         "actions": {
           "cbAvPSIhwBMBTI3D": {
             "type": "effect",
             "_id": "cbAvPSIhwBMBTI3D",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all Conscripts within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 6 physical damage each. Combine this damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -272,7 +273,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "MWfKUGzT1YBmLvpn",
       "img": "icons/creatures/abilities/tail-strike-bone-orange.webp",
diff --git a/src/packs/adversaries/adversary_Construct_uOP5oT9QzXPlnf3p.json b/src/packs/adversaries/adversary_Construct_uOP5oT9QzXPlnf3p.json
index b8d8cfa0..310eefce 100644
--- a/src/packs/adversaries/adversary_Construct_uOP5oT9QzXPlnf3p.json
+++ b/src/packs/adversaries/adversary_Construct_uOP5oT9QzXPlnf3p.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 75,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "uOP5oT9QzXPlnf3p",
@@ -222,14 +223,14 @@
       "_id": "y3oUmDLGkcSjOO5Q",
       "img": "icons/magic/unholy/silhouette-evil-horned-giant.webp",
       "system": {
-        "description": "<p>The Construct can be spotlighted up to two times per GM turn. Spend Fear as usual to spotlight them.</p>",
+        "description": "<p>The @Lookup[@name] can be spotlighted up to two times per GM turn. Spend Fear as usual to spotlight them.</p>",
         "resource": null,
         "actions": {
           "bay0pyPsCyDEZKuk": {
             "type": "effect",
             "_id": "bay0pyPsCyDEZKuk",
             "systemPath": "actions",
-            "description": "<p>The Construct can be spotlighted up to two times per GM turn. Spend Fear as usual to spotlight them.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "passive",
             "cost": [
@@ -281,7 +282,7 @@
       "_id": "p4HLIkiM3HsglRoA",
       "img": "icons/commodities/metal/barstock-broken-steel.webp",
       "system": {
-        "description": "<p>When the Construct marks HP from physical damage, they must mark an additional HP.</p>",
+        "description": "<p>When the @Lookup[@name] marks HP from physical damage, they must mark an additional HP.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -307,14 +308,14 @@
       "_id": "93m085bEaKFzvEWT",
       "img": "icons/skills/movement/arrow-upward-blue.webp",
       "system": {
-        "description": "<p><strong>Mark a Stress</strong> to make an attack against all targets in the Construct’s path when they move. Targets the Construct succeeds against take <strong>1d8</strong> physical damage.</p>",
+        "description": "<p><strong>Mark a Stress</strong> to make an attack against all targets in the @Lookup[@name]’s path when they move. Targets the @Lookup[@name] succeeds against take <strong>1d8</strong> physical damage.</p>",
         "resource": null,
         "actions": {
           "OswphW4Z1B5oa4ts": {
             "type": "attack",
             "_id": "OswphW4Z1B5oa4ts",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to make an attack against all targets in the Construct’s path when they move. Targets the Construct succeeds against take <strong>1d8</strong> physical damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -393,7 +394,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
@@ -414,14 +416,14 @@
       "_id": "EF6YIDjQ0liFubGA",
       "img": "icons/creatures/magical/construct-golem-stone-blue.webp",
       "system": {
-        "description": "<p>Before rolling damage for the Construct’s attack, you can <strong>mark a Stress</strong> to gain a +10 bonus to the damage roll. The Construct can then take the spotlight again.</p>",
+        "description": "<p>Before rolling damage for the @Lookup[@name]’s attack, you can <strong>mark a Stress</strong> to gain a +10 bonus to the damage roll. The @Lookup[@name] can then take the spotlight again.</p>",
         "resource": null,
         "actions": {
           "xYACTiZzApmCXXmf": {
             "type": "effect",
             "_id": "xYACTiZzApmCXXmf",
             "systemPath": "actions",
-            "description": "<p>Before rolling damage for the Construct’s attack, you can <strong>mark a Stress</strong> to gain a +10 bonus to the damage roll. The Construct can then take the spotlight again.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -449,7 +451,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "effects": [
         {
@@ -514,14 +517,14 @@
       "_id": "UlGLuV1L33tDWkli",
       "img": "icons/magic/sonic/explosion-shock-wave-teal.webp",
       "system": {
-        "description": "<p>When the Construct marks their last HP, the magic powering them ruptures in an explosion of force. Make an attack with advantage against all targets within Very Close range. Targets the Construct succeeds against take <strong>1d12+2</strong> magic damage.</p>",
+        "description": "<p>When the @Lookup[@name] marks their last HP, the magic powering them ruptures in an explosion of force. Make an attack with advantage against all targets within Very Close range. Targets the @Lookup[@name] succeeds against take <strong>1d12+2</strong> magic damage.</p>",
         "resource": null,
         "actions": {
           "fkIWRdcGPgHgm6VC": {
             "type": "attack",
             "_id": "fkIWRdcGPgHgm6VC",
             "systemPath": "actions",
-            "description": "<p>When the Construct marks their last HP, the magic powering them ruptures in an explosion of force. Make an attack with advantage against all targets within Very Close range. Targets the Construct succeeds against take <strong>1d12+2</strong> magic damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -593,7 +596,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "effects": [],
       "folder": null,
diff --git a/src/packs/adversaries/adversary_Courtesan_ZxWaWPdzFIUPNC62.json b/src/packs/adversaries/adversary_Courtesan_ZxWaWPdzFIUPNC62.json
index f6b94677..668cd943 100644
--- a/src/packs/adversaries/adversary_Courtesan_ZxWaWPdzFIUPNC62.json
+++ b/src/packs/adversaries/adversary_Courtesan_ZxWaWPdzFIUPNC62.json
@@ -122,7 +122,8 @@
       "source": "Daggerheart SRD",
       "page": 85,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "ZxWaWPdzFIUPNC62",
@@ -231,14 +232,14 @@
       "name": "Searing Glance",
       "type": "feature",
       "system": {
-        "description": "<p>When a PC within Close range makes a Presence Roll, you can <strong>mark a Stress</strong> to cast a gaze toward the aftermath. On the target’s failure, they must mark 2 Stress and are <em>Vulnerable</em> until the scene ends or they succeed on a social action against the Courtesan. On the target’s success, they must mark a Stress.</p>",
+        "description": "<p>When a PC within Close range makes a Presence Roll, you can <strong>mark a Stress</strong> to cast a gaze toward the aftermath. On the target’s failure, they must mark 2 Stress and are <em>Vulnerable</em> until the scene ends or they succeed on a social action against the @Lookup[@name]. On the target’s success, they must mark a Stress.</p>",
         "resource": null,
         "actions": {
           "dRtDCrAPLc1GYqBs": {
             "type": "damage",
             "_id": "dRtDCrAPLc1GYqBs",
             "systemPath": "actions",
-            "description": "<p>When a PC within Close range makes a Presence Roll, you can <strong>mark a Stress</strong> to cast a gaze toward the aftermath. On the target’s failure, they must mark 2 Stress and are <em>Vulnerable</em> until the scene ends or they succeed on a social action against the Courtesan. On the target’s success, they must mark a Stress.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -300,7 +301,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "rSMUPC5GhR982ifg",
       "img": "icons/magic/perception/eye-slit-orange.webp",
diff --git a/src/packs/adversaries/adversary_Courtier_CBBuEXAlLKFMJdjg.json b/src/packs/adversaries/adversary_Courtier_CBBuEXAlLKFMJdjg.json
index 28222226..6721666f 100644
--- a/src/packs/adversaries/adversary_Courtier_CBBuEXAlLKFMJdjg.json
+++ b/src/packs/adversaries/adversary_Courtier_CBBuEXAlLKFMJdjg.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 76,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "CBBuEXAlLKFMJdjg",
@@ -235,7 +236,7 @@
             "type": "attack",
             "_id": "Yi3rvjj0Umqt5Z8j",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to say something mocking and force a target within Close range to make a Presence Reaction Roll (14) to see if they can save face. On a failure, the target must mark 2 Stress and is Vulnerable until the scene ends.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -318,7 +319,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [
         {
@@ -378,14 +380,14 @@
       "_id": "Ux42ELBBuSYwm4yW",
       "img": "icons/skills/social/diplomacy-unity-alliance.webp",
       "system": {
-        "description": "<p><strong>Spend a Fear</strong> and target a PC. The Courtier convinces a crowd or prominent individual that the target is the cause of their current conflict or misfortune.</p>",
+        "description": "<p><strong>Spend a Fear</strong> and target a PC. The @Lookup[@name] convinces a crowd or prominent individual that the target is the cause of their current conflict or misfortune.</p>",
         "resource": null,
         "actions": {
           "IwuFowlcXyjvfOxp": {
             "type": "effect",
             "_id": "IwuFowlcXyjvfOxp",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> and target a PC. The Courtier convinces a crowd or prominent individual that the target is the cause of their current conflict or misfortune.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -413,7 +415,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
diff --git a/src/packs/adversaries/adversary_Cult_Adept_0NxCSugvKQ4W8OYZ.json b/src/packs/adversaries/adversary_Cult_Adept_0NxCSugvKQ4W8OYZ.json
index 7c90a78b..14eb579b 100644
--- a/src/packs/adversaries/adversary_Cult_Adept_0NxCSugvKQ4W8OYZ.json
+++ b/src/packs/adversaries/adversary_Cult_Adept_0NxCSugvKQ4W8OYZ.json
@@ -122,7 +122,8 @@
       "source": "Daggerheart SRD",
       "page": 85,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "0NxCSugvKQ4W8OYZ",
@@ -238,7 +239,7 @@
             "type": "attack",
             "_id": "TQv3o9sRnlDNbPyu",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to make a standard attack against a target within range. On a success, the target must mark a Stress.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -341,7 +342,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "kCffzM8rX8NEr9d2",
       "img": "icons/magic/unholy/beam-ringed-impact-purple.webp",
@@ -362,14 +364,14 @@
       "name": "Shroud of the Fallen",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Mark a Stress</strong> to wrap an ally within Close range in a shroud of Protection until the Adept marks their last HP. While Protected, the target has resistance to all damage.</p>",
+        "description": "<p><strong>Mark a Stress</strong> to wrap an ally within Close range in a shroud of Protection until the @Lookup[@name] marks their last HP. While Protected, the target has resistance to all damage.</p>",
         "resource": null,
         "actions": {
           "8yRj7EpEI4PlKNhl": {
             "type": "effect",
             "_id": "8yRj7EpEI4PlKNhl",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to wrap an ally within Close range in a shroud of Protection until the Adept marks their last HP. While Protected, the target has resistance to all damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -401,7 +403,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "IHWDn097sRgjlZXO",
       "img": "icons/magic/unholy/orb-contained-pink.webp",
@@ -479,7 +482,7 @@
             "type": "effect",
             "_id": "g4RDHrY0AEYXjH52",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> and choose a point within Far range. All targets within Close range of that point are <em>Restrained</em> in smoky chains until they break free with a successful Strength or Instinct Roll. A target Restrained by this feature must spend a Hope to make an action roll.</p><p>@Template[type:circle|range:c]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -511,7 +514,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "JpSrduK3vjd9h098",
       "img": "icons/magic/air/fog-gas-smoke-dense-pink.webp",
@@ -578,7 +582,7 @@
             "type": "healing",
             "_id": "3tibqB97ooJesxf0",
             "systemPath": "actions",
-            "description": "<p>Twice per scene, when a PC rolls a failure with Fear, clear a Stress.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -643,7 +647,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "x6FbcrfOscb3er6P",
       "img": "icons/magic/unholy/silhouette-robe-evil-glow.webp",
diff --git a/src/packs/adversaries/adversary_Cult_Fang_tyBOpLfigAhI9bU3.json b/src/packs/adversaries/adversary_Cult_Fang_tyBOpLfigAhI9bU3.json
index 76a338d2..57e7a7c7 100644
--- a/src/packs/adversaries/adversary_Cult_Fang_tyBOpLfigAhI9bU3.json
+++ b/src/packs/adversaries/adversary_Cult_Fang_tyBOpLfigAhI9bU3.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 86,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "tyBOpLfigAhI9bU3",
@@ -220,14 +221,14 @@
       "name": "Shadow's Embrace",
       "type": "feature",
       "system": {
-        "description": "<p>The Fang can climb and walk on vertical surfaces. <strong>Mark a Stress</strong> to move from one shadow to another within Far range.</p>",
+        "description": "<p>The @Lookup[@name] can climb and walk on vertical surfaces. <strong>Mark a Stress</strong> to move from one shadow to another within Far range.</p>",
         "resource": null,
         "actions": {
           "hjuqvsMB7KNLNvjg": {
             "type": "effect",
             "_id": "hjuqvsMB7KNLNvjg",
             "systemPath": "actions",
-            "description": "<p>The Fang can climb and walk on vertical surfaces. <strong>Mark a Stress</strong> to move from one shadow to another within Far range.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -275,14 +276,14 @@
       "name": "Pick Off the Straggler",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Mark a Stress</strong> to cause a target within Melee range to make an Instinct Reaction Roll. On a failure, the target must mark 2 Stress and is teleported with the Fang to a shadow within Far range, making them temporarily Vulnerable. On a success, the target must mark a Stress.</p>",
+        "description": "<p><strong>Mark a Stress</strong> to cause a target within Melee range to make an Instinct Reaction Roll. On a failure, the target must mark 2 Stress and is teleported with the @Lookup[@name] to a shadow within Far range, making them temporarily Vulnerable. On a success, the target must mark a Stress.</p>",
         "resource": null,
         "actions": {
           "QjQ04SAwfjrxliNI": {
             "type": "attack",
             "_id": "QjQ04SAwfjrxliNI",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to cause a target within Melee range to make an Instinct Reaction Roll. On a failure, the target must mark 2 Stress and is teleported with the Fang to a shadow within Far range, making them temporarily Vulnerable. On a success, the target must mark a Stress.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -364,7 +365,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "ohASSruBxcvuItIK",
       "img": "icons/magic/unholy/barrier-fire-pink.webp",
diff --git a/src/packs/adversaries/adversary_Cult_Initiate_zx99sOGTXicP4SSD.json b/src/packs/adversaries/adversary_Cult_Initiate_zx99sOGTXicP4SSD.json
index f748df8b..0e14a661 100644
--- a/src/packs/adversaries/adversary_Cult_Initiate_zx99sOGTXicP4SSD.json
+++ b/src/packs/adversaries/adversary_Cult_Initiate_zx99sOGTXicP4SSD.json
@@ -104,7 +104,8 @@
       "source": "Daggerheart SRD",
       "page": 86,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "zx99sOGTXicP4SSD",
@@ -213,7 +214,7 @@
       "name": "Minion (6)",
       "type": "feature",
       "system": {
-        "description": "<p>The Initiate is defeated when they take any damage. For every 6 damage a PC deals to the Initiate, defeat an additional Minion within range the attack would succeed against.</p>",
+        "description": "<p>The @Lookup[@name] is defeated when they take any damage. For every 6 damage a PC deals to the @Lookup[@name], defeat an additional Minion within range the attack would succeed against.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -238,14 +239,14 @@
       "name": "Group Attack",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all Cult Initiates within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 5 physical damage each. Combine this damage.</p>",
+        "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all Cult @Lookup[@name]s within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 5 physical damage each. Combine this damage.</p>",
         "resource": null,
         "actions": {
           "EH1preaTWBD4rOvx": {
             "type": "effect",
             "_id": "EH1preaTWBD4rOvx",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all Cult Initiates within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 5 physical damage each. Combine this damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -272,7 +273,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "WP6xQtYzouPEFr82",
       "img": "icons/creatures/abilities/tail-strike-bone-orange.webp",
diff --git a/src/packs/adversaries/adversary_Deeproot_Defender_9x2xY9zwc3xzbXo5.json b/src/packs/adversaries/adversary_Deeproot_Defender_9x2xY9zwc3xzbXo5.json
index eea41180..cd745eb6 100644
--- a/src/packs/adversaries/adversary_Deeproot_Defender_9x2xY9zwc3xzbXo5.json
+++ b/src/packs/adversaries/adversary_Deeproot_Defender_9x2xY9zwc3xzbXo5.json
@@ -116,7 +116,8 @@
       "source": "Daggerheart SRD",
       "page": 76,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "9x2xY9zwc3xzbXo5",
@@ -234,7 +235,7 @@
             "type": "damage",
             "_id": "55hCZsJQhJNcZ0lX",
             "systemPath": "actions",
-            "description": "<p>Slam the ground, knocking all targets within Very Close range back to Far range. Each target knocked back this way must mark a Stress.</p><p>@Template[type:emanation|range:vc]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -285,7 +286,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
@@ -306,14 +308,14 @@
       "_id": "rreGFW5TbhUoZf2T",
       "img": "icons/magic/nature/root-vine-entangled-hand.webp",
       "system": {
-        "description": "<p>Make an attack against a target within Close range. On a success, <strong>spend a Fear</strong> to pull them into Melee range, deal <strong>1d6+2</strong> physical damage, and <em>Restrain</em> them until the Defender takes Severe damage.</p>",
+        "description": "<p>Make an attack against a target within Close range. On a success, <strong>spend a Fear</strong> to pull them into Melee range, deal <strong>1d6+2</strong> physical damage, and <em>Restrain</em> them until the @Lookup[@name] takes Severe damage.</p>",
         "resource": null,
         "actions": {
           "nQ3vXrrKBizZoaDt": {
             "type": "attack",
             "_id": "nQ3vXrrKBizZoaDt",
             "systemPath": "actions",
-            "description": "<p>Make an attack against a target within Close range. On a success, <strong>spend a Fear</strong> to pull them into Melee range, deal <strong>1d6+2</strong> physical damage, and <em>Restrain</em> them until the Defender takes Severe damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -388,7 +390,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [
         {
diff --git a/src/packs/adversaries/adversary_Demon_of_Avarice_pnyjIGxxvurcWmTv.json b/src/packs/adversaries/adversary_Demon_of_Avarice_pnyjIGxxvurcWmTv.json
index 3c76628d..6bfb88a6 100644
--- a/src/packs/adversaries/adversary_Demon_of_Avarice_pnyjIGxxvurcWmTv.json
+++ b/src/packs/adversaries/adversary_Demon_of_Avarice_pnyjIGxxvurcWmTv.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 91,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "pnyjIGxxvurcWmTv",
@@ -226,7 +227,7 @@
       "name": "Money Talks",
       "type": "feature",
       "system": {
-        "description": "<p>Attacks against the Demon are made with disadvantage unless the attacker spends a handful of gold. This Demon starts with a number of handfuls equal to the number of PCs. When a target marks HP from the Demon’s standard attack, they can spend a handful of gold instead of marking HP (1 handful per HP). Add a handful of gold to the Demon for each handful of gold spent by PCs on this feature.</p>",
+        "description": "<p>Attacks against the @Lookup[@name] are made with disadvantage unless the attacker spends a handful of gold. This @Lookup[@name] starts with a number of handfuls equal to the number of PCs. When a target marks HP from the @Lookup[@name]’s standard attack, they can spend a handful of gold instead of marking HP (1 handful per HP). Add a handful of gold to the @Lookup[@name] for each handful of gold spent by PCs on this feature.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -251,7 +252,7 @@
       "name": "Number Must Go Up",
       "type": "feature",
       "system": {
-        "description": "<p>Add a bonus to the Demon’s attack rolls equal to the number of handfuls of gold they have.</p>",
+        "description": "<p>Add a bonus to the @Lookup[@name]’s attack rolls equal to the number of handfuls of gold they have.</p>",
         "resource": {
           "type": "simple",
           "value": 0,
@@ -329,7 +330,8 @@
         "resource": null,
         "actions": {},
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "BKgv2D1IdI813R8k",
       "img": "icons/skills/movement/arrows-up-trio-red.webp",
diff --git a/src/packs/adversaries/adversary_Demon_of_Despair_kE4dfhqmIQpNd44e.json b/src/packs/adversaries/adversary_Demon_of_Despair_kE4dfhqmIQpNd44e.json
index 3ae3639d..b1804074 100644
--- a/src/packs/adversaries/adversary_Demon_of_Despair_kE4dfhqmIQpNd44e.json
+++ b/src/packs/adversaries/adversary_Demon_of_Despair_kE4dfhqmIQpNd44e.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 92,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "kE4dfhqmIQpNd44e",
@@ -226,7 +227,7 @@
       "name": "Depths of Despair",
       "type": "feature",
       "system": {
-        "description": "<p>The Demon deals double damage to PCs with 0 Hope.</p>",
+        "description": "<p>The @Lookup[@name] deals double damage to PCs with 0 Hope.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -258,7 +259,7 @@
             "type": "effect",
             "_id": "n0RYO05pROFU6ov3",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to weigh down the spirits of all PCs within Far range. All targets affected replace their Hope Die with a <strong>d8</strong> until they roll a success with Hope or their next rest.</p><p>@Template[type:emanation|range:f]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -290,7 +291,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "FC8PIf4BVkhmoJX8",
       "img": "icons/magic/death/skull-flames-white-blue.webp",
@@ -355,7 +357,7 @@
             "type": "damage",
             "_id": "urrp8SCFgqbmSTvm",
             "systemPath": "actions",
-            "description": "<p>When a PC fails with Fear, you can <strong>mark a Stress</strong> to cause all other PCs within Close range to lose a Hope.</p><p>@Template[type:emanation|range:c]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -412,7 +414,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "dlMdfUjy2GaqgeOJ",
       "img": "icons/creatures/unholy/demon-fire-horned-mask.webp",
@@ -433,14 +436,14 @@
       "name": "Momentum",
       "type": "feature",
       "system": {
-        "description": "<p>When the Demon makes a successful attack against a PC, you gain a Fear.</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack against a PC, you gain a Fear.</p>",
         "resource": null,
         "actions": {
           "N0Xx6GnijLXIMGBw": {
             "type": "healing",
             "_id": "N0Xx6GnijLXIMGBw",
             "systemPath": "actions",
-            "description": "<p>When the Demon makes a successful attack against a PC, you gain a Fear.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -507,7 +510,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "7qjx1c4C1fUfvXnu",
       "img": "icons/skills/melee/strike-weapons-orange.webp",
diff --git a/src/packs/adversaries/adversary_Demon_of_Hubris_2VN3BftageoTTIzu.json b/src/packs/adversaries/adversary_Demon_of_Hubris_2VN3BftageoTTIzu.json
index b425ec66..16bc1d1f 100644
--- a/src/packs/adversaries/adversary_Demon_of_Hubris_2VN3BftageoTTIzu.json
+++ b/src/packs/adversaries/adversary_Demon_of_Hubris_2VN3BftageoTTIzu.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 92,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "2VN3BftageoTTIzu",
@@ -226,14 +227,14 @@
       "name": "Terrifying",
       "type": "feature",
       "system": {
-        "description": "<p>When the Demon makes a successful attack, all PCs within Far range must lose a Hope and you gain a Fear.</p><p>@Template[type:emanation|range:f]</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack, all PCs within Far range must lose a Hope and you gain a Fear.</p><p>@Template[type:emanation|range:f]</p>",
         "resource": null,
         "actions": {
           "v3XbljQeHEyfuSXz": {
             "type": "damage",
             "_id": "v3XbljQeHEyfuSXz",
             "systemPath": "actions",
-            "description": "<p>When the Demon makes a successful attack, all PCs within Far range must lose a Hope and you gain a Fear.</p><p>@Template[type:emanation|range:f]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -318,7 +319,7 @@
             "type": "damage",
             "_id": "nNfWqBgysVPtFh4w",
             "systemPath": "actions",
-            "description": "<p>When a PC within Far range fails a roll, they can choose to reroll their Fear Die and take the new result. If they still fail, they mark 2 Stress and the Demon clears a Stress.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -389,14 +390,14 @@
       "name": "Unparalleled Skill",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Mark a Stress</strong> to deal the Demon’s standard attack damage to a target within Close range.</p>",
+        "description": "<p><strong>Mark a Stress</strong> to deal the @Lookup[@name]’s standard attack damage to a target within Close range.</p>",
         "resource": null,
         "actions": {
           "MYOD2VAfdVC6hMCs": {
             "type": "damage",
             "_id": "MYOD2VAfdVC6hMCs",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to deal the Demon’s standard attack damage to a target within Close range.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -454,7 +455,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "Y3W44ifKIcoYpONN",
       "img": "icons/skills/melee/spear-tips-quintuple-orange.webp",
@@ -482,7 +484,7 @@
             "type": "effect",
             "_id": "ozGST8UY2MJnrd3w",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to spotlight two other Demons within Far range.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -509,7 +511,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "6BKWOTuxQWJd5RP5",
       "img": "icons/creatures/unholy/demon-fire-horned-winged-roar.webp",
@@ -530,14 +533,14 @@
       "name": "You Pale in Comparison",
       "type": "feature",
       "system": {
-        "description": "<p>When a PC fails a roll within Close range of the Demon, they must mark a Stress.</p><p>@Template[type:emanation|range:c]</p>",
+        "description": "<p>When a PC fails a roll within Close range of the @Lookup[@name], they must mark a Stress.</p><p>@Template[type:emanation|range:c]</p>",
         "resource": null,
         "actions": {
           "kuCPWb9cu3pZdAhh": {
             "type": "damage",
             "_id": "kuCPWb9cu3pZdAhh",
             "systemPath": "actions",
-            "description": "<p>When a PC fails a roll within Close range of the Demon, they must mark a Stress.</p><p>@Template[type:emanation|range:c]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -587,7 +590,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "FLp1dPSJz1ezY0gD",
       "img": "icons/magic/control/fear-fright-shadow-monster-red.webp",
diff --git a/src/packs/adversaries/adversary_Demon_of_Jealousy_SxSOkM4bcVOFyjbo.json b/src/packs/adversaries/adversary_Demon_of_Jealousy_SxSOkM4bcVOFyjbo.json
index 7ea12036..31f9b942 100644
--- a/src/packs/adversaries/adversary_Demon_of_Jealousy_SxSOkM4bcVOFyjbo.json
+++ b/src/packs/adversaries/adversary_Demon_of_Jealousy_SxSOkM4bcVOFyjbo.json
@@ -118,7 +118,8 @@
       "source": "Daggerheart SRD",
       "page": 92,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "SxSOkM4bcVOFyjbo",
@@ -227,7 +228,7 @@
       "name": "Unprotected Mind",
       "type": "feature",
       "system": {
-        "description": "<p> The Demon’s standard attack deals direct damage.</p>",
+        "description": "<p>The @Lookup[@name]’s standard attack deals direct damage.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -252,11 +253,12 @@
       "name": "My Turn",
       "type": "feature",
       "system": {
-        "description": "<p>When the Demon marks HP from an attack, <strong>spend a number of Fear equal to the HP marked by the Demon</strong> to cause the attacker to mark the same number of HP.</p>",
+        "description": "<p>When the @Lookup[@name] marks HP from an attack, <strong>spend a number of Fear equal to the HP marked by the @Lookup[@name]</strong> to cause the attacker to mark the same number of HP.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "KVyhgMJSSHTwRISA",
       "img": "icons/magic/control/fear-fright-monster-grin-purple-blue.webp",
@@ -284,7 +286,7 @@
             "type": "effect",
             "_id": "UU3H5aPQejOSoFZw",
             "systemPath": "actions",
-            "description": "<p>When a creature within Close range takes damage from a different adversary, you can <strong>mark a Stress</strong> to add a <strong>d4</strong> to the damage roll.</p><p>@Template[type:emanation|range:c]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -311,7 +313,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "pSAupMWw1eYqm84z",
       "img": "icons/magic/perception/eye-ringed-glow-angry-small-teal.webp",
@@ -332,14 +335,14 @@
       "name": "What's Yours Is Mine",
       "type": "feature",
       "system": {
-        "description": "<p>When a PC takes Severe damage within Very Close range of the Demon, you can <strong>spend a Fear</strong> to cause the target to make a Finesse Reaction Roll. On a failure, the Demon seizes one item or consumable of their choice from the target’s inventory.</p><p>@Template[type:emanation|range:vc]</p>",
+        "description": "<p>When a PC takes Severe damage within Very Close range of the @Lookup[@name], you can <strong>spend a Fear</strong> to cause the target to make a Finesse Reaction Roll. On a failure, the @Lookup[@name] seizes one item or consumable of their choice from the target’s inventory.</p><p>@Template[type:emanation|range:vc]</p>",
         "resource": null,
         "actions": {
           "3cGZ2CofM9HUlELH": {
             "type": "attack",
             "_id": "3cGZ2CofM9HUlELH",
             "systemPath": "actions",
-            "description": "<p>When a PC takes Severe damage within Very Close range of the Demon, you can <strong>spend a Fear</strong> to cause the target to make a Finesse Reaction Roll. On a failure, the Demon seizes one item or consumable of their choice from the target’s inventory.</p><p>@Template[type:emanation|range:vc]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -383,7 +386,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "589tCxFc8KZ3rdzP",
       "img": "icons/magic/perception/hand-eye-black.webp",
diff --git a/src/packs/adversaries/adversary_Demon_of_Wrath_5lphJAgzoqZI3VoG.json b/src/packs/adversaries/adversary_Demon_of_Wrath_5lphJAgzoqZI3VoG.json
index 72ec986d..9e838d6d 100644
--- a/src/packs/adversaries/adversary_Demon_of_Wrath_5lphJAgzoqZI3VoG.json
+++ b/src/packs/adversaries/adversary_Demon_of_Wrath_5lphJAgzoqZI3VoG.json
@@ -118,7 +118,8 @@
       "source": "Daggerheart SRD",
       "page": 92,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "_id": "5lphJAgzoqZI3VoG",
@@ -227,7 +228,7 @@
       "name": "Anger Unrelenting",
       "type": "feature",
       "system": {
-        "description": "<p>The Demon’s attacks deal direct damage.</p>",
+        "description": "<p>The @Lookup[@name]’s attacks deal direct damage.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -259,7 +260,7 @@
             "type": "effect",
             "_id": "V142qYppCGJn8OiN",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to boil the blood of all PCs within Far range. They use a d20 as their Fear Die until the end of the scene.</p><p>@Template[type:emanation|range:f]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -286,7 +287,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "a33PW8UkziliowlR",
       "img": "icons/skills/melee/maneuver-greatsword-yellow.webp",
@@ -307,14 +309,14 @@
       "name": "Retalliation",
       "type": "feature",
       "system": {
-        "description": "<p>When the Demon takes damage from an attack within Close range, you can <strong>mark a Stress</strong> to make a standard attack against the attacker.</p><p>@Template[type:emanation|range:c]</p>",
+        "description": "<p>When the @Lookup[@name] takes damage from an attack within Close range, you can <strong>mark a Stress</strong> to make a standard attack against the attacker.</p><p>@Template[type:emanation|range:c]</p>",
         "resource": null,
         "actions": {
           "hxrdtBm4dYN7KGZm": {
             "type": "attack",
             "_id": "hxrdtBm4dYN7KGZm",
             "systemPath": "actions",
-            "description": "<p>When the Demon takes damage from an attack within Close range, you can <strong>mark a Stress</strong> to make a standard attack against the attacker.</p><p>@Template[type:emanation|range:c]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -393,7 +395,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "DjGydqLXT4rDa7Av",
       "img": "icons/skills/melee/blood-slash-foam-red.webp",
@@ -414,14 +417,14 @@
       "name": "Blood and Souls",
       "type": "feature",
       "system": {
-        "description": "<p><em>Countdown (Loop 6)</em>. Activate the first time an attack is made within sight of the Demon. It ticks down when a PC takes a violent action. When it triggers, summon [[/r 1d4]]@UUID[Compendium.daggerheart.adversaries.Actor.3tqCjDwJAQ7JKqMb]{Minor Demons}, who appear at Close range.</p>",
+        "description": "<p><em>Countdown (Loop 6)</em>. Activate the first time an attack is made within sight of the @Lookup[@name]. It ticks down when a PC takes a violent action. When it triggers, summon [[/r 1d4]]@UUID[Compendium.daggerheart.adversaries.Actor.3tqCjDwJAQ7JKqMb]{Minor Demons}, who appear at Close range.</p>",
         "resource": null,
         "actions": {
           "szg3qA09aJUt9WKS": {
             "type": "countdown",
             "_id": "szg3qA09aJUt9WKS",
             "systemPath": "actions",
-            "description": "<p><em>Countdown (Loop 6)</em>. Activate the first time an attack is made within sight of the Demon. It ticks down when a PC takes a violent action.</p>",
+            "description": "<p><em>Countdown (Loop 6)</em>. Activate the first time an attack is made within sight of the @Lookup[@name]. It ticks down when a PC takes a violent action.</p>",
             "chatDisplay": true,
             "originItem": {
               "type": "itemCollection"
@@ -482,7 +485,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "2F75BO0xEU8Zlj7T",
       "img": "icons/creatures/unholy/demon-fire-horned-clawed.webp",
diff --git a/src/packs/adversaries/adversary_Demonic_Hound_Pack_NoRZ1PqB8N5wcIw0.json b/src/packs/adversaries/adversary_Demonic_Hound_Pack_NoRZ1PqB8N5wcIw0.json
index b7ac7cb5..2947b7a1 100644
--- a/src/packs/adversaries/adversary_Demonic_Hound_Pack_NoRZ1PqB8N5wcIw0.json
+++ b/src/packs/adversaries/adversary_Demonic_Hound_Pack_NoRZ1PqB8N5wcIw0.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 86,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "_id": "NoRZ1PqB8N5wcIw0",
@@ -226,7 +227,7 @@
       "name": "Horde (2d4+1)",
       "type": "feature",
       "system": {
-        "description": "<p>When the Pack has marked half or more of their HP, their standard attack deals <strong>2d4+1</strong> physical damage instead.</p>",
+        "description": "<p>When the @Lookup[@name] has marked half or more of their HP, their standard attack deals <strong>2d4+1</strong> physical damage instead.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -258,7 +259,7 @@
             "type": "damage",
             "_id": "XyLlX9RWSxciZ7oV",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to make all targets within Very Close range lose a Hope. If a target is not able to lose a Hope, they must instead mark 2 Stress.</p><p>@Template[type:emanation|range:vc]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -308,7 +309,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "WEbHwamS5ZBphiKq",
       "img": "icons/creatures/unholy/demons-horned-glowing-pink.webp",
@@ -329,14 +331,14 @@
       "name": "Momentum",
       "type": "feature",
       "system": {
-        "description": "<p>When the Pack makes a successful attack against a PC, you gain a Fear.</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack against a PC, you gain a Fear.</p>",
         "resource": null,
         "actions": {
           "BApDkAKPfyBkqrKY": {
             "type": "healing",
             "_id": "BApDkAKPfyBkqrKY",
             "systemPath": "actions",
-            "description": "<p>When the Pack makes a successful attack against a PC, you gain a Fear.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "reaction",
             "cost": [],
@@ -403,7 +405,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "3mOBJE5c3cP2cGP1",
       "img": "icons/skills/melee/strike-weapons-orange.webp",
diff --git a/src/packs/adversaries/adversary_Dire_Bat_tBWHW00epmMnkawe.json b/src/packs/adversaries/adversary_Dire_Bat_tBWHW00epmMnkawe.json
index 38bba1d3..16ec7643 100644
--- a/src/packs/adversaries/adversary_Dire_Bat_tBWHW00epmMnkawe.json
+++ b/src/packs/adversaries/adversary_Dire_Bat_tBWHW00epmMnkawe.json
@@ -116,7 +116,8 @@
       "source": "Daggerheart SRD",
       "page": 93,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "tBWHW00epmMnkawe",
@@ -225,7 +226,7 @@
       "name": "Flying",
       "type": "feature",
       "system": {
-        "description": "<p>While flying, the Bat gains a +3 bonus to their Difficulty.</p>",
+        "description": "<p>While flying, the @Lookup[@name] gains a +3 bonus to their Difficulty.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -294,14 +295,14 @@
       "name": "Screech",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Mark a Stress</strong> to send a high-pitch screech out toward all targets in front of the Bat within Far range. Those targets must mark <strong>1d4</strong> Stress.</p><p>@Template[type:inFront|range:f]</p>",
+        "description": "<p><strong>Mark a Stress</strong> to send a high-pitch screech out toward all targets in front of the @Lookup[@name] within Far range. Those targets must mark <strong>1d4</strong> Stress.</p><p>@Template[type:inFront|range:f]</p>",
         "resource": null,
         "actions": {
           "2ILfoiBoMyBCtBsL": {
             "type": "damage",
             "_id": "2ILfoiBoMyBCtBsL",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to send a high-pitch screech out toward all targets in front of the Bat within Far range. Those targets must mark <strong>1d4</strong> Stress.</p><p>@Template[type:inFront|range:f]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -350,7 +351,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "o69lipskvBwGVhe4",
       "img": "icons/magic/sonic/projectile-sound-rings-wave.webp",
@@ -378,7 +380,7 @@
             "type": "attack",
             "_id": "wW7WGisUBzyxjsH2",
             "systemPath": "actions",
-            "description": "<p>When an allied Vampire marks HP, you can <strong>mark a Stress</strong> to fl y into Melee range of the attacker and make an attack with advantage against them. On a success, deal <strong>2d6+2</strong> physical damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -456,7 +458,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "BQPGgbNzKbNkGDJb",
       "img": "icons/skills/melee/strike-slashes-red.webp",
diff --git a/src/packs/adversaries/adversary_Dire_Wolf_wNzeuQLfLUMvgHlQ.json b/src/packs/adversaries/adversary_Dire_Wolf_wNzeuQLfLUMvgHlQ.json
index a900aa7b..e3ecda4e 100644
--- a/src/packs/adversaries/adversary_Dire_Wolf_wNzeuQLfLUMvgHlQ.json
+++ b/src/packs/adversaries/adversary_Dire_Wolf_wNzeuQLfLUMvgHlQ.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 76,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "wNzeuQLfLUMvgHlQ",
@@ -228,14 +229,14 @@
       "_id": "wQXEnMqrl2jo91oy",
       "img": "icons/creatures/abilities/wolf-howl-moon-purple.webp",
       "system": {
-        "description": "<p>If the Wolf makes a successful standard attack and another Dire Wolf is within Melee range of the target, deal <strong>1d6+5</strong> physical damage instead of their standard damage and you gain a Fear.</p>",
+        "description": "<p>If the @Lookup[@name] makes a successful standard attack and another @Lookup[@name] is within Melee range of the target, deal <strong>1d6+5</strong> physical damage instead of their standard damage and you gain a Fear.</p>",
         "resource": null,
         "actions": {
           "FFQvt3sMfuwXxIrf": {
             "type": "attack",
             "_id": "FFQvt3sMfuwXxIrf",
             "systemPath": "actions",
-            "description": "<p>If the Wolf makes a successful standard attack and another Dire Wolf is within Melee range of the target, deal <strong>1d6+5</strong> physical damage instead of their standard damage and you gain a Fear.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "passive",
             "cost": [],
@@ -334,7 +335,7 @@
             "type": "attack",
             "_id": "Tvizq1jEfG8FyfNc",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to make an attack against a target within Melee range. On a success, deal <strong>3d4+10</strong> direct physical damage and make them <em>Vulnerable</em> until they clear at least 1 HP.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -417,7 +418,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [
         {
diff --git a/src/packs/adversaries/adversary_Dryad_wR7cFKrHvRzbzhBT.json b/src/packs/adversaries/adversary_Dryad_wR7cFKrHvRzbzhBT.json
index 845e447a..f0a5d81c 100644
--- a/src/packs/adversaries/adversary_Dryad_wR7cFKrHvRzbzhBT.json
+++ b/src/packs/adversaries/adversary_Dryad_wR7cFKrHvRzbzhBT.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 93,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "wR7cFKrHvRzbzhBT",
@@ -226,14 +227,14 @@
       "name": "Bramble Patch",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Mark a Stress</strong> to target a point within Far range. Create a patch of thorns that covers an area within Close range of that point. All targets within that area take <strong>2d6+2</strong> physical damage when they act. A target must succeed on a Finesse Roll or deal more than 20 damage to the Dryad with an attack to leave the area.</p><p>@Template[type:circle|range:c]</p>",
+        "description": "<p><strong>Mark a Stress</strong> to target a point within Far range. Create a patch of thorns that covers an area within Close range of that point. All targets within that area take <strong>2d6+2</strong> physical damage when they act. A target must succeed on a Finesse Roll or deal more than 20 damage to the @Lookup[@name] with an attack to leave the area.</p><p>@Template[type:circle|range:c]</p>",
         "resource": null,
         "actions": {
           "iCJdIs57hfh5Cb0u": {
             "type": "attack",
             "_id": "iCJdIs57hfh5Cb0u",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to target a point within Far range. Create a patch of thorns that covers an area within Close range of that point. All targets within that area take <strong>2d6+2</strong> physical damage when they act. A target must succeed on a Finesse Roll or deal more than 20 damage to the Dryad with an attack to leave the area.</p><p>@Template[type:circle|range:c]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -337,7 +338,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "i9HbArl09dX2BvzY",
       "img": "icons/magic/nature/root-vines-grow-brown.webp",
@@ -365,7 +367,7 @@
             "type": "effect",
             "_id": "84Q2b0zIY9c7Yhho",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to grow three @UUID[Compendium.daggerheart.adversaries.Actor.o63nS0k3wHu6EgKP]{Treant Sapling Minions}, who appear at Close range and immediately take the spotlight.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -392,7 +394,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "yKWQLL3qsEZlQjyb",
       "img": "icons/magic/nature/tree-animated-stump-mushrooms-teal.webp",
@@ -517,7 +520,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "z4JbqiHuxrWy6Cpu",
       "img": "icons/magic/nature/vines-thorned-curled-glow-teal-purple.webp",
diff --git a/src/packs/adversaries/adversary_Electric_Eels_TLzY1nDw0Bu9Ud40.json b/src/packs/adversaries/adversary_Electric_Eels_TLzY1nDw0Bu9Ud40.json
index 6d25a124..7b41b9e5 100644
--- a/src/packs/adversaries/adversary_Electric_Eels_TLzY1nDw0Bu9Ud40.json
+++ b/src/packs/adversaries/adversary_Electric_Eels_TLzY1nDw0Bu9Ud40.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 86,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "TLzY1nDw0Bu9Ud40",
@@ -220,7 +221,7 @@
       "name": "Horde (2d4+1)",
       "type": "feature",
       "system": {
-        "description": "<p>When the Eels have marked half or more of their HP, their standard attack deals <strong>2d4+1</strong> physical damage instead.</p>",
+        "description": "<p>When the @Lookup[@name] have marked half or more of their HP, their standard attack deals <strong>2d4+1</strong> physical damage instead.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -252,7 +253,7 @@
             "type": "attack",
             "_id": "L4Rpg7fnFuxpD3im",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to make a standard attack against all targets within Very Close range. You gain a Fear for each target that marks HP.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -330,7 +331,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "u5NL1eUJeAkIEpgt",
       "img": "icons/magic/lightning/bolt-strike-sparks-teal.webp",
diff --git a/src/packs/adversaries/adversary_Elemental_Spark_P7h54ZePFPHpYwvB.json b/src/packs/adversaries/adversary_Elemental_Spark_P7h54ZePFPHpYwvB.json
index a774d40e..b17cae1c 100644
--- a/src/packs/adversaries/adversary_Elemental_Spark_P7h54ZePFPHpYwvB.json
+++ b/src/packs/adversaries/adversary_Elemental_Spark_P7h54ZePFPHpYwvB.json
@@ -104,7 +104,8 @@
       "source": "Daggerheart SRD",
       "page": 93,
       "artist": ""
-    }
+    },
+    "size": "tiny"
   },
   "flags": {},
   "_id": "P7h54ZePFPHpYwvB",
@@ -213,7 +214,7 @@
       "name": "Minion (9)",
       "type": "feature",
       "system": {
-        "description": "<p>The Elemental is defeated when they take any damage. For every 9 damage a PC deals to the Elemental, defeat an additional Minion within range the attack would succeed against.</p>",
+        "description": "<p>The @Lookup[@name] is defeated when they take any damage. For every 9 damage a PC deals to the @Lookup[@name], defeat an additional Minion within range the attack would succeed against.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -238,7 +239,7 @@
       "name": "Group Attack",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all Elemental Sparks within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 5 physical damage each. Combine this damage.</p>",
+        "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all @Lookup[@name]s within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 5 physical damage each. Combine this damage.</p>",
         "resource": null,
         "actions": {
           "vXHZVb0Y7Hqu3uso": {
@@ -272,7 +273,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "13OraSLq2YjpZqbm",
       "img": "icons/creatures/abilities/tail-strike-bone-orange.webp",
diff --git a/src/packs/adversaries/adversary_Elite_Soldier_bfhVWMBUh61b9J6n.json b/src/packs/adversaries/adversary_Elite_Soldier_bfhVWMBUh61b9J6n.json
index 5baabdec..de5db0b2 100644
--- a/src/packs/adversaries/adversary_Elite_Soldier_bfhVWMBUh61b9J6n.json
+++ b/src/packs/adversaries/adversary_Elite_Soldier_bfhVWMBUh61b9J6n.json
@@ -143,7 +143,8 @@
       "source": "Daggerheart SRD",
       "page": 86,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "ownership": {
@@ -258,7 +259,7 @@
             "type": "attack",
             "_id": "XquYMA2xJZUKSmXQ",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to move into Melee range of an ally and make a standard attack against a target within Very Close range. On a success, deal <strong>2d10+2</strong> physical damage and the ally can clear a Stress.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -336,7 +337,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "ojiIZHBd0sMLxSUE",
       "img": "icons/skills/melee/hand-grip-sword-orange.webp",
@@ -357,14 +359,14 @@
       "name": "Vassal's Loyalty",
       "type": "feature",
       "system": {
-        "description": "<p>When the Soldier is within Very Close range of a knight or other noble who would take damage, you can mark a Stress to move into Melee range of them and take the damage instead.</p>",
+        "description": "<p>When the @Lookup[@name] is within Very Close range of a knight or other noble who would take damage, you can mark a Stress to move into Melee range of them and take the damage instead.</p>",
         "resource": null,
         "actions": {
           "dwpQNx63V6hL1mXZ": {
             "type": "effect",
             "_id": "dwpQNx63V6hL1mXZ",
             "systemPath": "actions",
-            "description": "<p>When the Soldier is within Very Close range of a knight or other noble who would take damage, you can mark a Stress to move into Melee range of them and take the damage instead.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -391,7 +393,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "zcfyEY29yWqJtZbl",
       "img": "icons/magic/defensive/shield-barrier-blue.webp",
diff --git a/src/packs/adversaries/adversary_Failed_Experiment_ChwwVqowFw8hJQwT.json b/src/packs/adversaries/adversary_Failed_Experiment_ChwwVqowFw8hJQwT.json
index 7d439a1b..39800002 100644
--- a/src/packs/adversaries/adversary_Failed_Experiment_ChwwVqowFw8hJQwT.json
+++ b/src/packs/adversaries/adversary_Failed_Experiment_ChwwVqowFw8hJQwT.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 86,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "ChwwVqowFw8hJQwT",
@@ -226,7 +227,7 @@
       "name": "Warped Fortitude",
       "type": "feature",
       "system": {
-        "description": "<p>The Experiment is resistant to physical damage.</p>",
+        "description": "<p>The @Lookup[@name] is resistant to physical damage.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -295,7 +296,7 @@
       "name": "Overwhelm",
       "type": "feature",
       "system": {
-        "description": "<p>When a target the Experiment attacks has other adversaries within Very Close range, the Experiment deals double damage.</p>",
+        "description": "<p>When a target the @Lookup[@name] attacks has other adversaries within Very Close range, the @Lookup[@name] deals double damage.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -320,14 +321,14 @@
       "name": "Lurching Lunge",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Mark a Stress</strong> to spotlight the Experiment as an additional GM move instead of spending Fear.</p>",
+        "description": "<p><strong>Mark a Stress</strong> to spotlight the @Lookup[@name] as an additional GM move instead of spending Fear.</p>",
         "resource": null,
         "actions": {
           "i3FANnO1t9AzJdTp": {
             "type": "effect",
             "_id": "i3FANnO1t9AzJdTp",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to spotlight the Experiment as an additional GM move instead of spending Fear.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -354,7 +355,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "g0h3Zo6xqgfSlyxi",
       "img": "icons/skills/melee/strike-slashes-red.webp",
diff --git a/src/packs/adversaries/adversary_Fallen_Shock_Troop_OsLG2BjaEdTZUJU9.json b/src/packs/adversaries/adversary_Fallen_Shock_Troop_OsLG2BjaEdTZUJU9.json
index df039d82..163c61f7 100644
--- a/src/packs/adversaries/adversary_Fallen_Shock_Troop_OsLG2BjaEdTZUJU9.json
+++ b/src/packs/adversaries/adversary_Fallen_Shock_Troop_OsLG2BjaEdTZUJU9.json
@@ -104,7 +104,8 @@
       "source": "Daggerheart SRD",
       "page": 97,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "OsLG2BjaEdTZUJU9",
@@ -213,7 +214,7 @@
       "name": "Minion (12)",
       "type": "feature",
       "system": {
-        "description": "<p>The Shock Troop is defeated when they take any damage. For every 12 damage a PC deals to the Shock Troop, defeat an additional Minion within range the attack would succeed against.</p>",
+        "description": "<p>The @Lookup[@name] is defeated when they take any damage. For every 12 damage a PC deals to the @Lookup[@name], defeat an additional Minion within range the attack would succeed against.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -238,7 +239,7 @@
       "name": "Aura of Doom",
       "type": "feature",
       "system": {
-        "description": "<p>When a PC marks HP from an attack by the Shock Troop, they lose a Hope.</p>",
+        "description": "<p>When a PC marks HP from an attack by the @Lookup[@name], they lose a Hope.</p>",
         "resource": null,
         "actions": {
           "HcGa2nD0WziA0lFP": {
@@ -316,14 +317,14 @@
       "name": "Group Attack",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all Fallen Shock Troops within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 12 physical damage each. Combine this damage.</p>",
+        "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all @Lookup[@name]s within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 12 physical damage each. Combine this damage.</p>",
         "resource": null,
         "actions": {
           "QHNRSEQmqOcaoXq4": {
             "type": "effect",
             "_id": "QHNRSEQmqOcaoXq4",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all Fallen Shock Troops within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 12 physical damage each. Combine this damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -350,7 +351,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "gC4whvt2r9Tfso9Y",
       "img": "icons/creatures/abilities/tail-strike-bone-orange.webp",
diff --git a/src/packs/adversaries/adversary_Fallen_Sorcerer_PELRry1vqjBzSAlr.json b/src/packs/adversaries/adversary_Fallen_Sorcerer_PELRry1vqjBzSAlr.json
index 48dbefcc..fc064958 100644
--- a/src/packs/adversaries/adversary_Fallen_Sorcerer_PELRry1vqjBzSAlr.json
+++ b/src/packs/adversaries/adversary_Fallen_Sorcerer_PELRry1vqjBzSAlr.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 97,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "PELRry1vqjBzSAlr",
@@ -226,14 +227,14 @@
       "name": "Conflagration",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Spend a Fear</strong> to unleash an all-consuming f i restorm and make an attack against all targets within Close range. Targets the Sorcerer succeeds against take <strong>2d10+6</strong> direct magic damage.</p><p>@Template[type:emanation|range:c]</p>",
+        "description": "<p><strong>Spend a Fear</strong> to unleash an all-consuming firestorm and make an attack against all targets within Close range. Targets the @Lookup[@name] succeeds against take <strong>2d10+6</strong> direct magic damage.</p><p>@Template[type:emanation|range:c]</p>",
         "resource": null,
         "actions": {
           "v7zZo52Dnj1e1i2G": {
             "type": "attack",
             "_id": "v7zZo52Dnj1e1i2G",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to unleash an all-consuming f i restorm and make an attack against all targets within Close range. Targets the Sorcerer succeeds against take <strong>2d10+6</strong> direct magic damage.</p><p>@Template[type:emanation|range:c]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -311,7 +312,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "s15sNyb3JYMzBLIU",
       "img": "icons/magic/fire/projectile-beams-salvo-red.webp",
@@ -339,7 +341,7 @@
             "type": "effect",
             "_id": "mXWOpXcYALYqicTw",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to trap a target within Far range in a powerful illusion of their worst fears. While trapped, the target is <em>Restrained</em> and <em>Vulnerable</em> until they break free, ending both conditions, with a successful Instinct Roll.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -364,7 +366,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "ecp9o8t1dQFXGsse",
       "img": "icons/magic/death/skull-energy-light-white.webp",
@@ -425,11 +428,12 @@
       "name": "Slippery",
       "type": "feature",
       "system": {
-        "description": "<p>When the Sorcerer takes damage from an attack, they can teleport up to Far range.</p>",
+        "description": "<p>When the @Lookup[@name] takes damage from an attack, they can teleport up to Far range.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "C74czwNeWF5vS1DZ",
       "img": "icons/magic/symbols/ring-circle-smoke-blue.webp",
@@ -450,7 +454,7 @@
       "name": "Shackles of Guilt",
       "type": "feature",
       "system": {
-        "description": "<p><em>Countdown (Loop 2d6)</em>. When the Sorcerer is in the spotlight for the first time, activate the countdown. When it triggers, all targets within Far range become Vulnerable and must mark a Stress as they relive their greatest regrets. A target can break free from their regret with a successful Presence or Strength Roll. When a PC fails to break free, they lose a Hope.</p><p>@Template[type:emanation|range:f]</p>",
+        "description": "<p><em>Countdown (Loop 2d6)</em>. When the @Lookup[@name] is in the spotlight for the first time, activate the countdown. When it triggers, all targets within Far range become Vulnerable and must mark a Stress as they relive their greatest regrets. A target can break free from their regret with a successful Presence or Strength Roll. When a PC fails to break free, they lose a Hope.</p><p>@Template[type:emanation|range:f]</p>",
         "resource": null,
         "actions": {
           "7b0FkpAnWz9a5EWx": {
@@ -514,7 +518,7 @@
             "type": "countdown",
             "_id": "11PtfoxbgOXxNlkG",
             "systemPath": "actions",
-            "description": "<p><em>Countdown (Loop 2d6)</em>. When the Sorcerer is in the spotlight for the first time, activate the countdown.</p>",
+            "description": "<p><em>Countdown (Loop 2d6)</em>. When the @Lookup[@name] is in the spotlight for the first time, activate the countdown.</p>",
             "chatDisplay": true,
             "originItem": {
               "type": "itemCollection"
@@ -549,7 +553,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "gwSgBhkcekCGvXxz",
       "img": "icons/magic/unholy/strike-hand-glow-pink.webp",
diff --git a/src/packs/adversaries/adversary_Fallen_Warlord__Realm_Breaker_hxZ0sgoFJubh5aj6.json b/src/packs/adversaries/adversary_Fallen_Warlord__Realm_Breaker_hxZ0sgoFJubh5aj6.json
index c432cae2..b2cdc489 100644
--- a/src/packs/adversaries/adversary_Fallen_Warlord__Realm_Breaker_hxZ0sgoFJubh5aj6.json
+++ b/src/packs/adversaries/adversary_Fallen_Warlord__Realm_Breaker_hxZ0sgoFJubh5aj6.json
@@ -160,7 +160,8 @@
       "source": "Daggerheart SRD",
       "page": 97,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "prototypeToken": {
     "name": "Fallen Warlord: Realm Breaker",
@@ -261,14 +262,14 @@
       "name": "Relentless (2)",
       "type": "feature",
       "system": {
-        "description": "<p>The Realm-Breaker can be spotlighted up to two times per GM turn. Spend Fear as usual to spotlight them.</p>",
+        "description": "<p>The @Lookup[@name] can be spotlighted up to two times per GM turn. Spend Fear as usual to spotlight them.</p>",
         "resource": null,
         "actions": {
           "9IHzeKjP35M5jj3b": {
             "type": "effect",
             "_id": "9IHzeKjP35M5jj3b",
             "systemPath": "actions",
-            "description": "<p>The Realm-Breaker can be spotlighted up to two times per GM turn. Spend Fear as usual to spotlight them.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "passive",
             "cost": [
@@ -319,14 +320,14 @@
       "name": "Firespite Plate Armor",
       "type": "feature",
       "system": {
-        "description": "<p>When the Realm-Breaker takes damage, reduce it by <strong>2d10</strong>.</p>",
+        "description": "<p>When the @Lookup[@name] takes damage, reduce it by <strong>2d10</strong>.</p>",
         "resource": null,
         "actions": {
           "djEIhnCsuCUdwC0m": {
             "type": "attack",
             "_id": "djEIhnCsuCUdwC0m",
             "systemPath": "actions",
-            "description": "<p>When the Realm-Breaker takes damage, reduce it by <strong>2d10</strong>.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -398,7 +399,7 @@
             "type": "attack",
             "_id": "zMVhUekP8pcyQGFR",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to make a standard attack against all targets within Very Close range. When a target uses armor to reduce damage from this attack, they must mark 2 Armor Slots.</p><p>@Template[type:emanation|range:vc]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -476,7 +477,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "PVLjJaQLH3LK3svk",
       "img": "icons/skills/melee/blood-slash-foam-red.webp",
@@ -497,14 +499,14 @@
       "name": "All-Consuming Rage",
       "type": "feature",
       "system": {
-        "description": "<p><em>Countdown (Decreasing 8)</em>. When the Realm-Breaker is in the spotlight for the first time, activate the countdown. When it triggers, create a torrent of incarnate rage that rends flesh from bone. All targets within Far range must make a Presence Reaction Roll. Targets who fail take <strong>2d6+10</strong> direct magic damage. Targets who succeed take half damage. For each HP marked from this damage, summon a @UUID[Compendium.daggerheart.adversaries.Actor.OsLG2BjaEdTZUJU9]{Fallen Shock Troop} within Very Close range of the target who marked that HP. If the countdown ever decreases its maximum value to 0, the Realm-Breaker marks their remaining HP and all targets within Far range must mark all remaining HP and make a death move.</p><p>@Template[type:emanation|range:f]</p>",
+        "description": "<p><em>Countdown (Decreasing 8)</em>. When the @Lookup[@name] is in the spotlight for the first time, activate the countdown. When it triggers, create a torrent of incarnate rage that rends flesh from bone. All targets within Far range must make a Presence Reaction Roll. Targets who fail take <strong>2d6+10</strong> direct magic damage. Targets who succeed take half damage. For each HP marked from this damage, summon a @UUID[Compendium.daggerheart.adversaries.Actor.OsLG2BjaEdTZUJU9]{Fallen Shock Troop} within Very Close range of the target who marked that HP. If the countdown ever decreases its maximum value to 0, the @Lookup[@name] marks their remaining HP and all targets within Far range must mark all remaining HP and make a death move.</p><p>@Template[type:emanation|range:f]</p>",
         "resource": null,
         "actions": {
           "rgy5wXyXJWh6uWxC": {
             "type": "attack",
             "_id": "rgy5wXyXJWh6uWxC",
             "systemPath": "actions",
-            "description": "<p>When it triggers, create a torrent of incarnate rage that rends flesh from bone. All targets within Far range must make a Presence Reaction Roll. Targets who fail take <strong>2d6+10</strong> direct magic damage. Targets who succeed take half damage. For each HP marked from this damage, summon a @UUID[Compendium.daggerheart.adversaries.Actor.OsLG2BjaEdTZUJU9]{Fallen Shock Troop} within Very Close range of the target who marked that HP. If the countdown ever decreases its maximum value to 0, the Realm-Breaker marks their remaining HP and all targets within Far range must mark all remaining HP and make a death move.</p><p>@Template[type:emanation|range:f]</p>",
+            "description": "<p>When it triggers, create a torrent of incarnate rage that rends flesh from bone. All targets within Far range must make a Presence Reaction Roll. Targets who fail take <strong>2d6+10</strong> direct magic damage. Targets who succeed take half damage. For each HP marked from this damage, summon a @UUID[Compendium.daggerheart.adversaries.Actor.OsLG2BjaEdTZUJU9]{Fallen Shock Troop} within Very Close range of the target who marked that HP. If the countdown ever decreases its maximum value to 0, the @Lookup[@name] marks their remaining HP and all targets within Far range must mark all remaining HP and make a death move.</p><p>@Template[type:emanation|range:f]</p>",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -577,7 +579,7 @@
             "type": "countdown",
             "_id": "8e3BHmOFLvRwPbTW",
             "systemPath": "actions",
-            "description": "<p><em>Countdown (Decreasing 8)</em>. When the Realm-Breaker is in the spotlight for the first time, activate the countdown.</p>",
+            "description": "<p><em>Countdown (Decreasing 8)</em>. When the @Lookup[@name] is in the spotlight for the first time, activate the countdown.</p>",
             "chatDisplay": true,
             "originItem": {
               "type": "itemCollection"
@@ -612,7 +614,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "48tIwFQr64IQ5LaY",
       "img": "icons/magic/control/fear-fright-monster-grin-red-orange.webp",
@@ -633,14 +636,14 @@
       "name": "Doombringer",
       "type": "feature",
       "system": {
-        "description": "<p>When a target marks HP from an attack by the Realm-Breaker, all PCs within Far range of the target must lose a Hope.</p><p>@Template[type:emanation|range:f]</p>",
+        "description": "<p>When a target marks HP from an attack by the @Lookup[@name], all PCs within Far range of the target must lose a Hope.</p><p>@Template[type:emanation|range:f]</p>",
         "resource": null,
         "actions": {
           "WEBPJCbXfBeyHFJ4": {
             "type": "damage",
             "_id": "WEBPJCbXfBeyHFJ4",
             "systemPath": "actions",
-            "description": "<p>When a target marks HP from an attack by the Realm-Breaker, all PCs within Far range of the target must lose a Hope.</p><p>@Template[type:emanation|range:f]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -690,7 +693,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "v74W0MUqVi9vPUEw",
       "img": "icons/magic/death/skull-energy-light-purple.webp",
@@ -711,11 +715,12 @@
       "name": "I Have Never Known Defeat",
       "type": "feature",
       "system": {
-        "description": "<p>When the Realm-Breaker marks their last HP, replace them with the @UUID[Compendium.daggerheart.adversaries.Actor.RXkZTwBRi4dJ3JE5]{Fallen Warlord: Undefeated Champion} and immediately spotlight them.</p>",
+        "description": "<p>When the @Lookup[@name] marks their last HP, replace them with the @UUID[Compendium.daggerheart.adversaries.Actor.RXkZTwBRi4dJ3JE5]{Fallen Warlord: Undefeated Champion} and immediately spotlight them.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "RscRTl8U8u6WcwAB",
       "img": "icons/magic/unholy/silhouette-evil-horned-giant.webp",
diff --git a/src/packs/adversaries/adversary_Fallen_Warlord__Undefeated_Champion_RXkZTwBRi4dJ3JE5.json b/src/packs/adversaries/adversary_Fallen_Warlord__Undefeated_Champion_RXkZTwBRi4dJ3JE5.json
index ab5d5c41..89d61c1c 100644
--- a/src/packs/adversaries/adversary_Fallen_Warlord__Undefeated_Champion_RXkZTwBRi4dJ3JE5.json
+++ b/src/packs/adversaries/adversary_Fallen_Warlord__Undefeated_Champion_RXkZTwBRi4dJ3JE5.json
@@ -161,7 +161,8 @@
       "source": "Daggerheart SRD",
       "page": 98,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "prototypeToken": {
     "name": "Fallen Warlord: Undefeated Champion",
@@ -262,14 +263,14 @@
       "name": "Relentless (3)",
       "type": "feature",
       "system": {
-        "description": "<p>The Undefeated Champion can be spotlighted up to three times per GM turn. Spend Fear as usual to spotlight them.</p>",
+        "description": "<p>The @Lookup[@name] can be spotlighted up to three times per GM turn. Spend Fear as usual to spotlight them.</p>",
         "resource": null,
         "actions": {
           "BoDTEH8Y6i9G1d4R": {
             "type": "effect",
             "_id": "BoDTEH8Y6i9G1d4R",
             "systemPath": "actions",
-            "description": "<p>The Undefeated Champion can be spotlighted up to three times per GM turn. Spend Fear as usual to spotlight them.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "passive",
             "cost": [
@@ -320,14 +321,14 @@
       "name": "Faltering Armor",
       "type": "feature",
       "system": {
-        "description": "<p>When the Undefeated Champion takes damage, reduce it by <strong>1d10</strong>.</p>",
+        "description": "<p>When the @Lookup[@name] takes damage, reduce it by <strong>1d10</strong>.</p>",
         "resource": null,
         "actions": {
           "REOzNvunSAU3UcEx": {
             "type": "attack",
             "_id": "REOzNvunSAU3UcEx",
             "systemPath": "actions",
-            "description": "<p>When the Undefeated Champion takes damage, reduce it by <strong>1d10</strong>.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -392,14 +393,14 @@
       "name": "Shattering Strike",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Mark a Stress</strong> to make a standard attack against all targets within Very Close range. PCs the Champion succeeds against lose a number of Hope equal to the HP they marked from this attack.</p><p>@Template[type:emanation|range:vc]</p>",
+        "description": "<p><strong>Mark a Stress</strong> to make a standard attack against all targets within Very Close range. PCs the @Lookup[@name] succeeds against lose a number of Hope equal to the HP they marked from this attack.</p><p>@Template[type:emanation|range:vc]</p>",
         "resource": null,
         "actions": {
           "t1GhGnEhNYyJ7p2U": {
             "type": "attack",
             "_id": "t1GhGnEhNYyJ7p2U",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to make a standard attack against all targets within Very Close range. PCs the Champion succeeds against lose a number of Hope equal to the HP they marked from this attack.</p><p>@Template[type:emanation|range:vc]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -470,7 +471,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "t8yOkGWmPgQ6EbIr",
       "img": "icons/skills/melee/sword-stuck-glowing-pink.webp",
@@ -498,7 +500,7 @@
             "type": "effect",
             "_id": "hGMzqw00JTlYfHYy",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to summon a number of @UUID[Compendium.daggerheart.adversaries.Actor.OsLG2BjaEdTZUJU9]{Fallen Shock Troops} equal to twice the number of PCs. The Shock Troops appear at Far range.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -525,7 +527,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "AP7W9ruUCdTHO69S",
       "img": "icons/magic/death/undead-skeleton-worn-blue.webp",
@@ -546,14 +549,14 @@
       "name": "Circle of Defilement",
       "type": "feature",
       "system": {
-        "description": "<p><em>Countdown (1d8)</em>. When the Undefeated Champion is in the spotlight for the first time, activate the countdown. When it triggers, activate a magical circle covering an area within Far range of the Champion. A target within that area is Vulnerable until they leave the circle. The circle can be removed by dealing Severe damage to the Undefeated Champion.</p>",
+        "description": "<p><em>Countdown (1d8)</em>. When the @Lookup[@name] is in the spotlight for the first time, activate the countdown. When it triggers, activate a magical circle covering an area within Far range of the @Lookup[@name]. A target within that area is Vulnerable until they leave the circle. The circle can be removed by dealing Severe damage to the @Lookup[@name].</p>",
         "resource": null,
         "actions": {
           "mHeYZ8e8MbkGz22d": {
             "type": "effect",
             "_id": "mHeYZ8e8MbkGz22d",
             "systemPath": "actions",
-            "description": "<p>Activate a magical circle covering an area within Far range of the Champion. A target within that area is Vulnerable until they leave the circle. The circle can be removed by dealing Severe damage to the Undefeated Champion.</p>",
+            "description": "<p>Activate a magical circle covering an area within Far range of the @Lookup[@name]. A target within that area is Vulnerable until they leave the circle. The circle can be removed by dealing Severe damage to the @Lookup[@name].</p>",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -580,7 +583,7 @@
             "type": "countdown",
             "_id": "4x13WyksHU0u0j20",
             "systemPath": "actions",
-            "description": "<p><em>Countdown (1d8)</em>. When the Undefeated Champion is in the spotlight for the first time, activate the countdown.</p>",
+            "description": "<p><em>Countdown (1d8)</em>. When the @Lookup[@name] is in the spotlight for the first time, activate the countdown.</p>",
             "chatDisplay": true,
             "originItem": {
               "type": "itemCollection"
@@ -615,7 +618,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "55P7ZijSbQeVHCw4",
       "img": "icons/magic/unholy/barrier-fire-pink.webp",
@@ -675,14 +679,14 @@
       "name": "Momentum",
       "type": "feature",
       "system": {
-        "description": "<p>When the Undefeated Champion makes a successful attack against a PC, you gain a Fear.</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack against a PC, you gain a Fear.</p>",
         "resource": null,
         "actions": {
           "i1Wmh6Mok4Qsur00": {
             "type": "healing",
             "_id": "i1Wmh6Mok4Qsur00",
             "systemPath": "actions",
-            "description": "<p>When the Undefeated Champion makes a successful attack against a PC, you gain a Fear.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "reaction",
             "cost": [],
@@ -749,7 +753,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "ReWtcLE5akrSauI1",
       "img": "icons/skills/melee/strike-weapons-orange.webp",
@@ -770,14 +775,14 @@
       "name": "Doombringer",
       "type": "feature",
       "system": {
-        "description": "<p>When a target marks HP from an attack by the Undefeated Champion, all PCs within Far range of the target lose a Hope.</p><p>@Template[type:emanation|range:f]</p>",
+        "description": "<p>When a target marks HP from an attack by the @Lookup[@name], all PCs within Far range of the target lose a Hope.</p><p>@Template[type:emanation|range:f]</p>",
         "resource": null,
         "actions": {
           "liwKSCTmQqZasAf6": {
             "type": "damage",
             "_id": "liwKSCTmQqZasAf6",
             "systemPath": "actions",
-            "description": "<p>When a target marks HP from an attack by the Undefeated Champion, all PCs within Far range of the target lose a Hope.</p><p>@Template[type:emanation|range:f]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -827,7 +832,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "tQRotPLi3eokgUdM",
       "img": "icons/magic/death/skull-energy-light-purple.webp",
diff --git a/src/packs/adversaries/adversary_Giant_Beastmaster_8VZIgU12cB3cvlyH.json b/src/packs/adversaries/adversary_Giant_Beastmaster_8VZIgU12cB3cvlyH.json
index 7eb4f6fc..6d09a490 100644
--- a/src/packs/adversaries/adversary_Giant_Beastmaster_8VZIgU12cB3cvlyH.json
+++ b/src/packs/adversaries/adversary_Giant_Beastmaster_8VZIgU12cB3cvlyH.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 87,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "_id": "8VZIgU12cB3cvlyH",
@@ -226,7 +227,7 @@
       "name": "Two as One",
       "type": "feature",
       "system": {
-        "description": "<p>When the Beastmaster is spotlighted, you can also spotlight a Tier 1 animal adversary currently under their control.</p>",
+        "description": "<p>When the @Lookup[@name] is spotlighted, you can also spotlight a Tier 1 animal adversary currently under their control.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -258,7 +259,7 @@
             "type": "attack",
             "_id": "ErwQgU4dwBcmZIBX",
             "systemPath": "actions",
-            "description": "<p>Make a standard attack against a target. On a success, you can <strong>mark a Stress</strong> to pin them to a nearby surface. The pinned target is <em>Restrained</em> until they break free with a successful Finesse or Strength Roll.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -332,7 +333,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "6ZrDjgnWufJohkp1",
       "img": "icons/skills/ranged/arrow-flying-broadhead-metal.webp",
@@ -392,14 +394,14 @@
       "name": "Deadly Companion",
       "type": "feature",
       "system": {
-        "description": "<p>Twice per scene, summon a Bear, Dire Wolf, or similar Tier 1 animal adversary under the Beastmaster’s control. The adversary appears at Close range and is immediately spotlighted.</p>",
+        "description": "<p>Twice per scene, summon a Bear, Dire Wolf, or similar Tier 1 animal adversary under the @Lookup[@name]’s control. The adversary appears at Close range and is immediately spotlighted.</p>",
         "resource": null,
         "actions": {
           "eSRUMqpQDPRG9leg": {
             "type": "effect",
             "_id": "eSRUMqpQDPRG9leg",
             "systemPath": "actions",
-            "description": "<p>Twice per scene, summon a @UUID[Compendium.daggerheart.adversaries.Actor.71qKDLKO3CsrNkdy]{Bear}, @UUID[Compendium.daggerheart.adversaries.Actor.wNzeuQLfLUMvgHlQ]{Dire Wolf} or similar Tier 1 animal adversary under the Beastmaster’s control. The adversary appears at Close range and is immediately spotlighted.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -420,7 +422,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "w1oHm0NoEavQgUzl",
       "img": "icons/creatures/mammals/ox-bull-horned-glowing-orange.webp",
diff --git a/src/packs/adversaries/adversary_Giant_Brawler_YnObCleGjPT7yqEc.json b/src/packs/adversaries/adversary_Giant_Brawler_YnObCleGjPT7yqEc.json
index bce45f4c..4f76b706 100644
--- a/src/packs/adversaries/adversary_Giant_Brawler_YnObCleGjPT7yqEc.json
+++ b/src/packs/adversaries/adversary_Giant_Brawler_YnObCleGjPT7yqEc.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 87,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "_id": "YnObCleGjPT7yqEc",
@@ -226,14 +227,14 @@
       "name": "Battering Ram",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Mark a Stress</strong> to have the Brawler charge at an inanimate object within Close range they could feasibly smash (such as a wall, cart, or market stand) and destroy it. All targets within Very Close range of the object must succeed on an Agility Reaction Roll or take <strong>2d4+3</strong> physical damage from the shrapnel.</p><p>@Template[type:circle|range:vc]</p>",
+        "description": "<p><strong>Mark a Stress</strong> to have the @Lookup[@name] charge at an inanimate object within Close range they could feasibly smash (such as a wall, cart, or market stand) and destroy it. All targets within Very Close range of the object must succeed on an Agility Reaction Roll or take <strong>2d4+3</strong> physical damage from the shrapnel.</p><p>@Template[type:circle|range:vc]</p>",
         "resource": null,
         "actions": {
           "zns57MqnZ6M1d4r0": {
             "type": "attack",
             "_id": "zns57MqnZ6M1d4r0",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to have the Brawler charge at an inanimate object within Close range they could feasibly smash (such as a wall, cart, or market stand) and destroy it. All targets within Very Close range of the object must succeed on an Agility Reaction Roll or take <strong>2d4+3</strong> physical damage from the shrapnel.</p><p>@Template[type:circle|range:vc]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -311,7 +312,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "ro8AtBdgklyyuydK",
       "img": "icons/skills/melee/shield-damaged-broken-orange.webp",
@@ -332,14 +334,14 @@
       "name": "Bloody Reprisal",
       "type": "feature",
       "system": {
-        "description": "<p>When the Brawler marks 2 or more HP from an attack within Very Close range, you can make a standard attack against the attacker. On a success, the Brawler deals <strong>2d6+15</strong> physical damage instead of their standard damage.</p>",
+        "description": "<p>When the @Lookup[@name] marks 2 or more HP from an attack within Very Close range, you can make a standard attack against the attacker. On a success, the @Lookup[@name] deals <strong>2d6+15</strong> physical damage instead of their standard damage.</p>",
         "resource": null,
         "actions": {
           "D53yjFXoP5uFXe9M": {
             "type": "attack",
             "_id": "D53yjFXoP5uFXe9M",
             "systemPath": "actions",
-            "description": "<p>When the Brawler marks 2 or more HP from an attack within Very Close range, you can make a standard attack against the attacker. On a success, the Brawler deals <strong>2d6+15</strong> physical damage instead of their standard damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -410,7 +412,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "kKBbEAffbHxmHo15",
       "img": "icons/skills/melee/strike-flail-spiked-pink.webp",
@@ -431,14 +434,14 @@
       "name": "Momentum",
       "type": "feature",
       "system": {
-        "description": "<p>When the Brawler makes a successful attack against a PC, you gain a Fear.</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack against a PC, you gain a Fear.</p>",
         "resource": null,
         "actions": {
           "U2AfyadkJluHXA4r": {
             "type": "healing",
             "_id": "U2AfyadkJluHXA4r",
             "systemPath": "actions",
-            "description": "<p>When the Brawler makes a successful attack against a PC you gain a Fear.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "reaction",
             "cost": [],
@@ -505,7 +508,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "B0EniYxyLvjJSqYb",
       "img": "icons/skills/melee/strike-weapons-orange.webp",
diff --git a/src/packs/adversaries/adversary_Giant_Eagle_OMQ0v6PE8s1mSU0K.json b/src/packs/adversaries/adversary_Giant_Eagle_OMQ0v6PE8s1mSU0K.json
index 7606d09f..b0ba4170 100644
--- a/src/packs/adversaries/adversary_Giant_Eagle_OMQ0v6PE8s1mSU0K.json
+++ b/src/packs/adversaries/adversary_Giant_Eagle_OMQ0v6PE8s1mSU0K.json
@@ -143,7 +143,8 @@
       "source": "Daggerheart SRD",
       "page": 87,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "ownership": {
@@ -251,7 +252,7 @@
       "name": "Flight",
       "type": "feature",
       "system": {
-        "description": "<p>While flying, the Eagle gains a +3 bonus to their Difficulty.</p>",
+        "description": "<p>While flying, the @Lookup[@name] gains a +3 bonus to their Difficulty.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -327,7 +328,7 @@
             "type": "attack",
             "_id": "KwsxjI3jBzmxgkPu",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to attack a target within Far range. On a success, deal <strong>2d10+2</strong> physical damage and knock the target over, making them <em>Vulnerable</em> until they next act.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -410,7 +411,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "MabIQE1Kjn60j08J",
       "img": "icons/skills/melee/strike-slashes-orange.webp",
@@ -470,14 +472,14 @@
       "name": "Take Off",
       "type": "feature",
       "system": {
-        "description": "<p>Make an attack against a target within Very Close range. On a success, deal <strong>2d4+3</strong> physical damage and the target must succeed on an Agility Reaction Roll or become temporarily Restrained within the Eagle’s massive talons. If the target is Restrained, the Eagle immediately lifts into the air to Very Far range above the battlefi eld while holding them. </p>",
+        "description": "<p>Make an attack against a target within Very Close range. On a success, deal <strong>2d4+3</strong> physical damage and the target must succeed on an Agility Reaction Roll or become temporarily Restrained within the @Lookup[@name]’s massive talons. If the target is Restrained, the @Lookup[@name] immediately lifts into the air to Very Far range above the battlefi eld while holding them.</p>",
         "resource": null,
         "actions": {
           "NtgA9EQPF2Rdb9KK": {
             "type": "attack",
             "_id": "NtgA9EQPF2Rdb9KK",
             "systemPath": "actions",
-            "description": "<p>Make an attack against a target within Very Close range. On a success, deal <strong>2d4+3</strong> physical damage and the target must succeed on an Agility Reaction Roll or become temporarily Restrained within the Eagle’s massive talons. If the target is Restrained, the Eagle immediately lifts into the air to Very Far range above the battlefi eld while holding them.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -553,7 +555,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "NEOQ0E9AGSSIDm4v",
       "img": "icons/skills/movement/arrow-upward-yellow.webp",
@@ -613,14 +616,14 @@
       "name": "Deadly Drop",
       "type": "feature",
       "system": {
-        "description": "<p>While flying, the Eagle can drop a Restrained target they are holding. When dropped, the target is no longer Restrained but starts falling. If their fall isn’t prevented during the PCs’ next action, the target takes <strong>2d20</strong> physical damage when they land.</p>",
+        "description": "<p>While flying, the @Lookup[@name] can drop a Restrained target they are holding. When dropped, the target is no longer Restrained but starts falling. If their fall isn’t prevented during the PCs’ next action, the target takes <strong>2d20</strong> physical damage when they land.</p>",
         "resource": null,
         "actions": {
           "1tO018UgL0VG51ti": {
             "type": "damage",
             "_id": "1tO018UgL0VG51ti",
             "systemPath": "actions",
-            "description": "<p>While flying, the Eagle can drop a Restrained target they are holding. When dropped, the target is no longer Restrained but starts falling. If their fall isn’t prevented during the PCs’ next action, the target takes <strong>2d20</strong> physical damage when they land.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -671,7 +674,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "jY0ynjYvbS6E3NgJ",
       "img": "icons/skills/movement/arrow-down-pink.webp",
diff --git a/src/packs/adversaries/adversary_Giant_Mosquitoes_IIWV4ysJPFPnTP7W.json b/src/packs/adversaries/adversary_Giant_Mosquitoes_IIWV4ysJPFPnTP7W.json
index 7b21aca5..54f12efa 100644
--- a/src/packs/adversaries/adversary_Giant_Mosquitoes_IIWV4ysJPFPnTP7W.json
+++ b/src/packs/adversaries/adversary_Giant_Mosquitoes_IIWV4ysJPFPnTP7W.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 76,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "IIWV4ysJPFPnTP7W",
@@ -228,7 +229,7 @@
       "_id": "9RduwBLYcBaiouYk",
       "img": "icons/creatures/magical/humanoid-silhouette-aliens-green.webp",
       "system": {
-        "description": "<p>When the Mosquitoes have marked half or more of their HP, their standard attack deals <strong>1d4+1</strong> physical damage instead.</p>",
+        "description": "<p>When the @Lookup[@name] have marked half or more of their HP, their standard attack deals <strong>1d4+1</strong> physical damage instead.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -254,7 +255,7 @@
       "_id": "gxYV6iTMM1S9Vv5v",
       "img": "icons/commodities/biological/wing-insect-green.webp",
       "system": {
-        "description": "<p>While flying, the Mosquitoes have a +2 bonus to their Difficulty.</p>",
+        "description": "<p>While flying, the @Lookup[@name] have a +2 bonus to their Difficulty.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -324,14 +325,14 @@
       "_id": "BTlMLjG65KQs0Jk2",
       "img": "icons/skills/wounds/blood-drip-droplet-red.webp",
       "system": {
-        "description": "<p>When the Mosquitoes’ attack causes a target to mark HP, you can <strong>mark a Stress</strong> to force the target to mark an additional HP.</p>",
+        "description": "<p>When the @Lookup[@name]’s attack causes a target to mark HP, you can <strong>mark a Stress</strong> to force the target to mark an additional HP.</p>",
         "resource": null,
         "actions": {
           "7ee6IhkKYDehjLmg": {
             "type": "effect",
             "_id": "7ee6IhkKYDehjLmg",
             "systemPath": "actions",
-            "description": "<p>When the Mosquitoes’ attack causes a target to mark HP, you can <strong>mark a Stress</strong> to force the target to mark an additional HP.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -359,7 +360,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "effects": [],
       "folder": null,
diff --git a/src/packs/adversaries/adversary_Giant_Rat_4PfLnaCrOcMdb4dK.json b/src/packs/adversaries/adversary_Giant_Rat_4PfLnaCrOcMdb4dK.json
index afeb44ad..d4655880 100644
--- a/src/packs/adversaries/adversary_Giant_Rat_4PfLnaCrOcMdb4dK.json
+++ b/src/packs/adversaries/adversary_Giant_Rat_4PfLnaCrOcMdb4dK.json
@@ -110,7 +110,8 @@
       "source": "Daggerheart SRD",
       "page": 76,
       "artist": ""
-    }
+    },
+    "size": "small"
   },
   "flags": {},
   "_id": "4PfLnaCrOcMdb4dK",
@@ -221,7 +222,7 @@
       "_id": "v3AcLcWrXy2rtW4Z",
       "img": "icons/magic/symbols/runes-carved-stone-yellow.webp",
       "system": {
-        "description": "<p>The Rat is defeated when they take any damage. For every 3 damage a PC deals to the Rat, defeat an additional Minion within range the attack would succeed against.</p>",
+        "description": "<p>The @Lookup[@name] is defeated when they take any damage. For every 3 damage a PC deals to the @Lookup[@name], defeat an additional Minion within range the attack would succeed against.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -247,14 +248,14 @@
       "_id": "fsaBlCjTdq1jM23G",
       "img": "icons/creatures/abilities/tail-strike-bone-orange.webp",
       "system": {
-        "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all Giant Rats within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 1 physical damage each. Combine this damage.</p>",
+        "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all @Lookup[@name]s within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 1 physical damage each. Combine this damage.</p>",
         "resource": null,
         "actions": {
           "q8chow47nQLR9qeF": {
             "type": "attack",
             "_id": "q8chow47nQLR9qeF",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all Giant Rats within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 1 physical damage each. Combine this damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -306,7 +307,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
diff --git a/src/packs/adversaries/adversary_Giant_Recruit_5s8wSvpyC5rxY5aD.json b/src/packs/adversaries/adversary_Giant_Recruit_5s8wSvpyC5rxY5aD.json
index a38fce28..75da96b2 100644
--- a/src/packs/adversaries/adversary_Giant_Recruit_5s8wSvpyC5rxY5aD.json
+++ b/src/packs/adversaries/adversary_Giant_Recruit_5s8wSvpyC5rxY5aD.json
@@ -104,7 +104,8 @@
       "source": "Daggerheart SRD",
       "page": 87,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "_id": "5s8wSvpyC5rxY5aD",
@@ -213,7 +214,7 @@
       "name": "Minion (7)",
       "type": "feature",
       "system": {
-        "description": "<p>The Recruit is defeated when they take any damage. For every 7 damage a PC deals to the Recruit, defeat an additional Minion within range the attack would succeed against.</p>",
+        "description": "<p>The @Lookup[@name] is defeated when they take any damage. For every 7 damage a PC deals to the @Lookup[@name], defeat an additional Minion within range the attack would succeed against.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -238,14 +239,14 @@
       "name": "Group Attack",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all Giant Recruits within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 5 physical damage each. Combine this damage.</p>",
+        "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all @Lookup[@name]s within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 5 physical damage each. Combine this damage.</p>",
         "resource": null,
         "actions": {
           "DjbPQowW1OdBD9Zn": {
             "type": "effect",
             "_id": "DjbPQowW1OdBD9Zn",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all Giant Recruits within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 5 physical damage each. Combine this damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -274,7 +275,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "FMgB28X1LammRInU",
       "img": "icons/creatures/abilities/tail-strike-bone-orange.webp",
diff --git a/src/packs/adversaries/adversary_Giant_Scorpion_fmfntuJ8mHRCAktP.json b/src/packs/adversaries/adversary_Giant_Scorpion_fmfntuJ8mHRCAktP.json
index d5f25734..99b5ed46 100644
--- a/src/packs/adversaries/adversary_Giant_Scorpion_fmfntuJ8mHRCAktP.json
+++ b/src/packs/adversaries/adversary_Giant_Scorpion_fmfntuJ8mHRCAktP.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 76,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "fmfntuJ8mHRCAktP",
@@ -235,7 +236,7 @@
             "type": "attack",
             "_id": "PJbZ4ibLPle9BBRv",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to make a standard attack against two targets within Melee range.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -314,7 +315,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
@@ -342,7 +344,7 @@
             "type": "attack",
             "_id": "ZkcplnqoMP7dH9F4",
             "systemPath": "actions",
-            "description": "<p>Make an attack against a target within Very Close range. On a success, <strong>spend a Fear</strong> to deal <strong>1d4+4</strong> physical damage and Poison them until their next rest or they succeed on a Knowledge Roll (16). While Poisoned, the target must roll a <strong>d6</strong> before they make an action roll. On a result of 4 or lower, they must mark a Stress.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -419,7 +421,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [
         {
@@ -477,7 +480,7 @@
       "_id": "TmDpAY5t3PjhEv9K",
       "img": "icons/skills/melee/strike-weapons-orange.webp",
       "system": {
-        "description": "<p>When the Scorpion makes a successful attack against a PC, you gain a Fear.</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack against a PC, you gain a Fear.</p>",
         "resource": null,
         "actions": {
           "1Fn4rvhueQoMXqFc": {
@@ -552,7 +555,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "effects": [],
       "folder": null,
diff --git a/src/packs/adversaries/adversary_Glass_Snake_8KWVLWXFhlY2kYx0.json b/src/packs/adversaries/adversary_Glass_Snake_8KWVLWXFhlY2kYx0.json
index ec94123b..f02a1c52 100644
--- a/src/packs/adversaries/adversary_Glass_Snake_8KWVLWXFhlY2kYx0.json
+++ b/src/packs/adversaries/adversary_Glass_Snake_8KWVLWXFhlY2kYx0.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 77,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "_id": "8KWVLWXFhlY2kYx0",
@@ -222,14 +223,14 @@
       "_id": "Efa6t9Ow8b1DRyZV",
       "img": "icons/skills/melee/shield-damaged-broken-gold.webp",
       "system": {
-        "description": "<p>On a successful attack within Melee range against the Snake, the attacker must mark an Armor Slot without receiving its benefits (they can still use armor to reduce the damage). If they can’t mark an Armor Slot, they must mark an additional HP.</p>",
+        "description": "<p>On a successful attack within Melee range against the @Lookup[@name], the attacker must mark an Armor Slot without receiving its benefits (they can still use armor to reduce the damage). If they can’t mark an Armor Slot, they must mark an additional HP.</p>",
         "resource": null,
         "actions": {
           "H1nUSOudbtha1lnC": {
             "type": "damage",
             "_id": "H1nUSOudbtha1lnC",
             "systemPath": "actions",
-            "description": "<p>On a successful attack within Melee range against the Snake, the attacker must mark an Armor Slot without receiving its benefits (they can still use armor to reduce the damage). If they can’t mark an Armor Slot, they must mark an additional HP.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -301,14 +302,14 @@
       "_id": "Ro9XCeXsTOT9SXyo",
       "img": "icons/skills/melee/blood-slash-foam-red.webp",
       "system": {
-        "description": "<p><strong>Mark a Stress</strong> to make an attack against all targets within Very Close range. Targets the Snake succeeds against take <strong>1d6+1</strong> physical damage.</p>",
+        "description": "<p><strong>Mark a Stress</strong> to make an attack against all targets within Very Close range. Targets the @Lookup[@name] succeeds against take <strong>1d6+1</strong> physical damage.</p>",
         "resource": null,
         "actions": {
           "2UzeQYL5HeyF3zwh": {
             "type": "attack",
             "_id": "2UzeQYL5HeyF3zwh",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to make an attack against all targets within Very Close range. Targets the Snake succeeds against take <strong>1d6+1</strong> physical damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -385,7 +386,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
@@ -406,7 +408,7 @@
       "_id": "LR5XHauNtWcl18CY",
       "img": "icons/magic/acid/projectile-needles-salvo-green.webp",
       "system": {
-        "description": "<p><strong>Spend a Fear</strong> to introduce a <strong>d6</strong> Spitter Die. When the Snake is in the spotlight, roll this die. On a result of 5 or higher, all targets in front of the Snake within Far range must succeed on an Agility Reaction Roll or take <strong>1d4</strong> physical damage. The Snake can take the spotlight a second time this GM turn.</p><p>@Template[type:inFront|range:f]</p>",
+        "description": "<p><strong>Spend a Fear</strong> to introduce a <strong>d6</strong> Spitter Die. When the @Lookup[@name] is in the spotlight, roll this die. On a result of 5 or higher, all targets in front of the @Lookup[@name] within Far range must succeed on an Agility Reaction Roll or take <strong>1d4</strong> physical damage. The @Lookup[@name] can take the spotlight a second time this GM turn.</p><p>@Template[type:inFront|range:f]</p>",
         "resource": null,
         "actions": {
           "yx5fjMLLwSnvSbqs": {
@@ -447,7 +449,7 @@
             "type": "attack",
             "_id": "Ds6KlQKZCOhh5OMT",
             "systemPath": "actions",
-            "description": "<p>All targets in front of the Snake within Far range must succeed on an Agility Reaction Roll or take <strong>1d4</strong> physical damage.</p><p>@Template[type:inFront|range:f]</p>",
+            "description": "<p>All targets in front of the @Lookup[@name] within Far range must succeed on an Agility Reaction Roll or take <strong>1d4</strong> physical damage.</p><p>@Template[type:inFront|range:f]</p>",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -520,7 +522,7 @@
             "type": "attack",
             "_id": "xccwknU2xHUwQSdn",
             "systemPath": "actions",
-            "description": "<p>When the Snake is in the spotlight, roll the spitter die. On a result of 5 or higher, do a spit Attack.</p>",
+            "description": "<p>When the @Lookup[@name] is in the spotlight, roll the spitter die. On a result of 5 or higher, do a spit Attack.</p>",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -565,7 +567,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [
         {
diff --git a/src/packs/adversaries/adversary_Gorgon_8mJYMpbLTb8qIOrr.json b/src/packs/adversaries/adversary_Gorgon_8mJYMpbLTb8qIOrr.json
index 7445c992..deeafa37 100644
--- a/src/packs/adversaries/adversary_Gorgon_8mJYMpbLTb8qIOrr.json
+++ b/src/packs/adversaries/adversary_Gorgon_8mJYMpbLTb8qIOrr.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 88,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "8mJYMpbLTb8qIOrr",
@@ -226,14 +227,14 @@
       "name": "Relentless (2)",
       "type": "feature",
       "system": {
-        "description": "<p>The Gorgon can be spotlighted up to two times per GM turn. Spend Fear as usual to spotlight them.</p>",
+        "description": "<p>The @Lookup[@name] can be spotlighted up to two times per GM turn. Spend Fear as usual to spotlight them.</p>",
         "resource": null,
         "actions": {
           "GSYD7y0ywAqyKUfm": {
             "type": "effect",
             "_id": "GSYD7y0ywAqyKUfm",
             "systemPath": "actions",
-            "description": "<p>The Gorgon can be spotlighted up to two times per GM turn. Spend Fear as usual to spotlight them.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "passive",
             "cost": [
@@ -284,14 +285,14 @@
       "name": "Sunsear Arrows",
       "type": "feature",
       "system": {
-        "description": "<p>When the Gorgon makes a successful standard attack, the target Glows until the end of the scene and can’t become <em>Hidden</em>. Attack rolls made against a Glowing target have advantage.</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful standard attack, the target Glows until the end of the scene and can’t become <em>Hidden</em>. Attack rolls made against a Glowing target have advantage.</p>",
         "resource": null,
         "actions": {
           "fnTd5BjBAK46vRRk": {
             "type": "effect",
             "_id": "fnTd5BjBAK46vRRk",
             "systemPath": "actions",
-            "description": "<p>When the Gorgon makes a successful standard attack, the target Glows until the end of the scene and can’t become <em>Hidden</em>. Attack rolls made against a Glowing target have advantage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -381,14 +382,14 @@
       "name": "Crown of Serpents",
       "type": "feature",
       "system": {
-        "description": "<p>Make an attack roll against a target within Melee range using the Gorgon’s protective snakes. On a success, mark a Stress to deal <strong>2d10+4</strong> physical damage and the target must mark a Stress.</p>",
+        "description": "<p>Make an attack roll against a target within Melee range using the @Lookup[@name]’s protective snakes. On a success, mark a Stress to deal <strong>2d10+4</strong> physical damage and the target must mark a Stress.</p>",
         "resource": null,
         "actions": {
           "ryfj8eiYYNGJPtBg": {
             "type": "attack",
             "_id": "ryfj8eiYYNGJPtBg",
             "systemPath": "actions",
-            "description": "<p>Make an attack roll against a target within Melee range using the Gorgon’s protective snakes. On a success, mark a Stress to deal <strong>2d10+4</strong> physical damage and the target must mark a Stress.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -484,7 +485,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "9SO2ov36lFH2YV0S",
       "img": "icons/creatures/reptiles/snake-fangs-bite-green.webp",
@@ -505,14 +507,14 @@
       "name": "Petrifying Gaze",
       "type": "feature",
       "system": {
-        "description": "<p>When the Gorgon takes damage from an attack within Close range, you can <strong>spend a Fear</strong> to force the attacker to make an Instinct Reaction Roll. On a failure, they begin to turn to stone, marking a HP and starting a Petrification Countdown (4). This countdown ticks down when the Gorgon is attacked. When it triggers, the target must make a death move. If the Gorgon is defeated, all petrification countdowns end.</p>",
+        "description": "<p>When the @Lookup[@name] takes damage from an attack within Close range, you can <strong>spend a Fear</strong> to force the attacker to make an Instinct Reaction Roll. On a failure, they begin to turn to stone, marking a HP and starting a Petrification Countdown (4). This countdown ticks down when the @Lookup[@name] is attacked. When it triggers, the target must make a death move. If the @Lookup[@name] is defeated, all petrification countdowns end.</p>",
         "resource": null,
         "actions": {
           "ySkX0wOpEFqtgeD9": {
             "type": "attack",
             "_id": "ySkX0wOpEFqtgeD9",
             "systemPath": "actions",
-            "description": "<p>When the Gorgon takes damage from an attack within Close range, you can <strong>spend a Fear</strong> to force the attacker to make an Instinct Reaction Roll. On a failure, they begin to turn to stone, marking a HP and starting a Petrification Countdown (4). This countdown ticks down when the Gorgon is attacked. When it triggers, the target must make a death move. If the Gorgon is defeated, all petrification countdowns end.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -565,7 +567,7 @@
             "type": "countdown",
             "_id": "ywZTs3D8ClT7tAsa",
             "systemPath": "actions",
-            "description": "<p>On a failure, they begin to turn to stone, marking a HP and starting a Petrification Countdown (4). This countdown ticks down when the Gorgon is attacked. When it triggers, the target must make a death move. If the Gorgon is defeated, all petrification countdowns end.</p>",
+            "description": "<p>On a failure, they begin to turn to stone, marking a HP and starting a Petrification Countdown (4). This countdown ticks down when the @Lookup[@name] is attacked. When it triggers, the target must make a death move. If the @Lookup[@name] is defeated, all petrification countdowns end.</p>",
             "chatDisplay": false,
             "originItem": {
               "type": "itemCollection"
@@ -600,7 +602,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "047o6OtNlUwLG1H1",
       "img": "icons/magic/earth/strike-body-stone-crumble.webp",
@@ -621,14 +624,14 @@
       "name": "Momentum",
       "type": "feature",
       "system": {
-        "description": "<p>When the Gorgon makes a successful attack against a PC, you gain a Fear.</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack against a PC, you gain a Fear.</p>",
         "resource": null,
         "actions": {
           "V6tkBYSjOt1LZCkp": {
             "type": "healing",
             "_id": "V6tkBYSjOt1LZCkp",
             "systemPath": "actions",
-            "description": "<p>When the Gorgon makes a successful attack against a PC, you gain a Fear.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "reaction",
             "cost": [],
@@ -695,7 +698,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "IRIaFxFughjXVu0Y",
       "img": "icons/skills/melee/strike-weapons-orange.webp",
diff --git a/src/packs/adversaries/adversary_Greater_Earth_Elemental_dsfB3YhoL5SudvS2.json b/src/packs/adversaries/adversary_Greater_Earth_Elemental_dsfB3YhoL5SudvS2.json
index 3a19084d..a20d80e6 100644
--- a/src/packs/adversaries/adversary_Greater_Earth_Elemental_dsfB3YhoL5SudvS2.json
+++ b/src/packs/adversaries/adversary_Greater_Earth_Elemental_dsfB3YhoL5SudvS2.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 93,
       "artist": ""
-    }
+    },
+    "size": "gargantuan"
   },
   "flags": {},
   "_id": "dsfB3YhoL5SudvS2",
@@ -220,7 +221,7 @@
       "name": "Slow",
       "type": "feature",
       "system": {
-        "description": "<p>When you spotlight the Elemental and they don’t have a token on their stat block, they can’t act yet. Place a token on their stat block and describe what they’re preparing to do. When you spotlight the Elemental and they have a token on their stat block, clear the token and they can act.</p>",
+        "description": "<p>When you spotlight the @Lookup[@name] and they don’t have a token on their stat block, they can’t act yet. Place a token on their stat block and describe what they’re preparing to do. When you spotlight the @Lookup[@name] and they have a token on their stat block, clear the token and they can act.</p>",
         "resource": {
           "type": "simple",
           "value": 0,
@@ -250,14 +251,14 @@
       "name": "Crushing Blows",
       "type": "feature",
       "system": {
-        "description": "<p>When the Elemental makes a successful attack, the target must mark an Armor Slot without receiving its benefi ts (they can still use armor to reduce the damage). If they can’t mark an Armor Slot, they must mark an additional HP.</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack, the target must mark an Armor Slot without receiving its benefi ts (they can still use armor to reduce the damage). If they can’t mark an Armor Slot, they must mark an additional HP.</p>",
         "resource": null,
         "actions": {
           "0sXciTiPc30v8czv": {
             "type": "damage",
             "_id": "0sXciTiPc30v8czv",
             "systemPath": "actions",
-            "description": "<p>When the Elemental makes a successful attack, the target must mark an Armor Slot without receiving its benefi ts (they can still use armor to reduce the damage). If they can’t mark an Armor Slot, they must mark an additional HP.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -328,7 +329,7 @@
       "name": "Immovable Object",
       "type": "feature",
       "system": {
-        "description": "<p>An attack that would move the Elemental moves them two fewer ranges (for example, Far becomes Very Close). When the Elemental takes physical damage, reduce it by 7.</p>",
+        "description": "<p>An attack that would move the @Lookup[@name] moves them two fewer ranges (for example, Far becomes Very Close). When the @Lookup[@name] takes physical damage, reduce it by 7.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -397,14 +398,14 @@
       "name": "Rockslide",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Mark a Stress</strong> to create a rockslide that buries the land in front of Elemental within Close range with rockfall. All targets in this area must make an Agility Reaction Roll (19). Targets who fail take <strong>2d12+5</strong> physical damage and become Vulnerable until their next roll with Hope. Targets who succeed take half damage.</p><p>@Template[type:inFront|range:c]</p>",
+        "description": "<p><strong>Mark a Stress</strong> to create a rockslide that buries the land in front of @Lookup[@name] within Close range with rockfall. All targets in this area must make an Agility Reaction Roll (19). Targets who fail take <strong>2d12+5</strong> physical damage and become Vulnerable until their next roll with Hope. Targets who succeed take half damage.</p><p>@Template[type:inFront|range:c]</p>",
         "resource": null,
         "actions": {
           "eLGIC3kVjLo8FEvy": {
             "type": "attack",
             "_id": "eLGIC3kVjLo8FEvy",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to create a rockslide that buries the land in front of Elemental within Close range with rockfall. All targets in this area must make an Agility Reaction Roll (19). Targets who fail take <strong>2d12+5</strong> physical damage and become Vulnerable until their next roll with Hope. Targets who succeed take half damage.</p><p>@Template[type:inFront|range:c]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -487,7 +488,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "q45DiEFlXqcXZ5hv",
       "img": "icons/magic/earth/barrier-stone-brown-green.webp",
@@ -547,14 +549,14 @@
       "name": "Momentum",
       "type": "feature",
       "system": {
-        "description": "<p>When the Elemental makes a successful attack against a PC, you gain a Fear.</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack against a PC, you gain a Fear.</p>",
         "resource": null,
         "actions": {
           "FPIpslusIeVQGdnb": {
             "type": "healing",
             "_id": "FPIpslusIeVQGdnb",
             "systemPath": "actions",
-            "description": "<p>When the Elemental makes a successful attack against a PC, you gain a Fear.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "reaction",
             "cost": [],
@@ -621,7 +623,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "ag7t5EW358M0qiSL",
       "img": "icons/skills/melee/strike-weapons-orange.webp",
diff --git a/src/packs/adversaries/adversary_Greater_Water_Elemental_xIICT6tEdnA7dKDV.json b/src/packs/adversaries/adversary_Greater_Water_Elemental_xIICT6tEdnA7dKDV.json
index bdc22b1a..be037b10 100644
--- a/src/packs/adversaries/adversary_Greater_Water_Elemental_xIICT6tEdnA7dKDV.json
+++ b/src/packs/adversaries/adversary_Greater_Water_Elemental_xIICT6tEdnA7dKDV.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 93,
       "artist": ""
-    }
+    },
+    "size": "gargantuan"
   },
   "flags": {},
   "_id": "xIICT6tEdnA7dKDV",
@@ -227,7 +228,7 @@
             "type": "attack",
             "_id": "Gk5tcqshtwP4JsKS",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to attack a target within Very Close range. On a success, deal <strong>2d4+7</strong> physical damage and the target’s next action has disadvantage. On a failure, the target must mark a Stress.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -310,7 +311,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "B8ZrtRCZrwwwWJOE",
       "img": "icons/magic/water/projectile-icecicle-glowing.webp",
@@ -375,14 +377,14 @@
       "name": "Drowning Embrace",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Spend a Fear</strong> to make an attack against all targets within Very Close range. Targets the Elemental succeeds against become <em>Restrained</em> and <em>Vulnerable</em> as they begin drowning. A target can break free, ending both conditions, with a successful Strength or Instinct Roll.</p><p>@Template[type:emanation|range:vc]</p>",
+        "description": "<p><strong>Spend a Fear</strong> to make an attack against all targets within Very Close range. Targets the @Lookup[@name] succeeds against become <em>Restrained</em> and <em>Vulnerable</em> as they begin drowning. A target can break free, ending both conditions, with a successful Strength or Instinct Roll.</p><p>@Template[type:emanation|range:vc]</p>",
         "resource": null,
         "actions": {
           "ooYbiLrYjoWXIfe9": {
             "type": "attack",
             "_id": "ooYbiLrYjoWXIfe9",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to make an attack against all targets within Very Close range. Targets the Elemental succeeds against become <em>Restrained</em> and <em>Vulnerable</em> as they begin drowning. A target can break free, ending both conditions, with a successful Strength or Instinct Roll.</p><p>@Template[type:emanation|range:vc]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -438,7 +440,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "bcwFQeuU6ZfIGjau",
       "img": "icons/magic/water/vortex-water-whirlpool-blue.webp",
@@ -499,14 +502,14 @@
       "name": "High Tide",
       "type": "feature",
       "system": {
-        "description": "<p>When the Elemental makes a successful standard attack, you can <strong>mark a Stress</strong> to knock the target back to Close range.</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful standard attack, you can <strong>mark a Stress</strong> to knock the target back to Close range.</p>",
         "resource": null,
         "actions": {
           "MXSyEGbaHeFgyOsB": {
             "type": "effect",
             "_id": "MXSyEGbaHeFgyOsB",
             "systemPath": "actions",
-            "description": "<p>When the Elemental makes a successful standard attack, you can <strong>mark a Stress</strong> to knock the target back to Close range.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -533,7 +536,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "BGE42W1XPd0vpimR",
       "img": "icons/magic/water/tendrils-ice-thorns.webp",
diff --git a/src/packs/adversaries/adversary_Green_Ooze_SHXedd9zZPVfUgUa.json b/src/packs/adversaries/adversary_Green_Ooze_SHXedd9zZPVfUgUa.json
index 426803c2..c7446a11 100644
--- a/src/packs/adversaries/adversary_Green_Ooze_SHXedd9zZPVfUgUa.json
+++ b/src/packs/adversaries/adversary_Green_Ooze_SHXedd9zZPVfUgUa.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 80,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "SHXedd9zZPVfUgUa",
@@ -228,7 +229,7 @@
       "_id": "DquXi9yCNsPAFEmK",
       "img": "icons/magic/time/hourglass-brown-orange.webp",
       "system": {
-        "description": "<p>When you spotlight the Ooze and they don’t have a token on their stat block, they can’t act yet. Place a token on their stat block and describe what they’re preparing to do. When you spotlight the Ooze and they have a token on their stat block, clear the token and they can act.</p>",
+        "description": "<p>When you spotlight the @Lookup[@name] and they don’t have a token on their stat block, they can’t act yet. Place a token on their stat block and describe what they’re preparing to do. When you spotlight the @Lookup[@name] and they have a token on their stat block, clear the token and they can act.</p>",
         "resource": {
           "type": "simple",
           "value": 0,
@@ -259,14 +260,14 @@
       "_id": "gJWoUSTGwVsJwPmK",
       "img": "icons/skills/melee/shield-damaged-broken-gold.webp",
       "system": {
-        "description": "<p>When the Ooze makes a successful attack, the target must mark an Armor Slot without receiving its benefits (they can still use armor to reduce the damage). If they can’t mark an Armor Slot, they must mark an additional HP.</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack, the target must mark an Armor Slot without receiving its benefits (they can still use armor to reduce the damage). If they can’t mark an Armor Slot, they must mark an additional HP.</p>",
         "resource": null,
         "actions": {
           "nU4xpjruOvskcmiA": {
             "type": "damage",
             "_id": "nU4xpjruOvskcmiA",
             "systemPath": "actions",
-            "description": "<p>When the Ooze makes a successful attack, the target must mark an Armor Slot without receiving its benefits (they can still use armor to reduce the damage). If they can’t mark an Armor Slot, they must mark an additional HP.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -338,14 +339,14 @@
       "_id": "Sm9Sk4mSvcq6PkmR",
       "img": "icons/creatures/slimes/slime-face-melting-green.webp",
       "system": {
-        "description": "<p>Make a standard attack against a target within Melee range. On a success, the Ooze envelops them and the target must mark 2 Stress. The target must mark an additional Stress when they make an action roll. If the Ooze takes Severe damage, the target is freed.</p>",
+        "description": "<p>Make a standard attack against a target within Melee range. On a success, the @Lookup[@name] envelops them and the target must mark 2 Stress. The target must mark an additional Stress when they make an action roll. If the @Lookup[@name] takes Severe damage, the target is freed.</p>",
         "resource": null,
         "actions": {
           "fSxq0AL6YwZs7OAH": {
             "type": "attack",
             "_id": "fSxq0AL6YwZs7OAH",
             "systemPath": "actions",
-            "description": "<p>Make a standard attack against a target within Melee range. On a success, the Ooze envelops them and the target must mark 2 Stress. The target must mark an additional Stress when they make an action roll. If the Ooze takes Severe damage, the target is freed.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -447,7 +448,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [
         {
@@ -505,14 +507,14 @@
       "_id": "qNhrEK2YF8e3ljU6",
       "img": "icons/creatures/slimes/slime-movement-pseudopods-green.webp",
       "system": {
-        "description": "<p>When the Ooze has 3 or more HP marked, you can <strong>spend a Fear</strong> to split them into two @UUID[Compendium.daggerheart.adversaries.Actor.aLkLFuVoKz2NLoBK]{Tiny Green Oozes} (with no marked HP or Stress). Immediately spotlight both of them.</p>",
+        "description": "<p>When the @Lookup[@name] has 3 or more HP marked, you can <strong>spend a Fear</strong> to split them into two @UUID[Compendium.daggerheart.adversaries.Actor.aLkLFuVoKz2NLoBK]{Tiny Green Oozes} (with no marked HP or Stress). Immediately spotlight both of them.</p>",
         "resource": null,
         "actions": {
           "s5mLw6DRGd76MLcC": {
             "type": "effect",
             "_id": "s5mLw6DRGd76MLcC",
             "systemPath": "actions",
-            "description": "<p>When the Ooze has 3 or more HP marked, you can <strong>spend a Fear</strong> to split them into two @UUID[Compendium.daggerheart.adversaries.Actor.aLkLFuVoKz2NLoBK]{Tiny Green Oozes} (with no marked HP or Stress). Immediately spotlight both of them.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -540,7 +542,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "effects": [],
       "folder": null,
diff --git a/src/packs/adversaries/adversary_Hallowed_Archer_kabueAo6BALApWqp.json b/src/packs/adversaries/adversary_Hallowed_Archer_kabueAo6BALApWqp.json
index 43e10f5f..0abf1661 100644
--- a/src/packs/adversaries/adversary_Hallowed_Archer_kabueAo6BALApWqp.json
+++ b/src/packs/adversaries/adversary_Hallowed_Archer_kabueAo6BALApWqp.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 98,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "kabueAo6BALApWqp",
@@ -220,7 +221,7 @@
       "name": "Punish the Guilty",
       "type": "feature",
       "system": {
-        "description": "<p>The Archer deals double damage to targets marked Guilty by a High Seraph.</p>",
+        "description": "<p>The @Lookup[@name] deals double damage to targets marked Guilty by a High Seraph.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -252,7 +253,7 @@
             "type": "attack",
             "_id": "pQLfy0I6sZhgAoIm",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to make a standard attack against up to three targets.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -330,7 +331,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "Ye35DuZroQfeFoNw",
       "img": "icons/skills/ranged/arrows-flying-salvo-yellow.webp",
diff --git a/src/packs/adversaries/adversary_Hallowed_Soldier_VENwg7xEFcYObjmT.json b/src/packs/adversaries/adversary_Hallowed_Soldier_VENwg7xEFcYObjmT.json
index b9a50759..cceed989 100644
--- a/src/packs/adversaries/adversary_Hallowed_Soldier_VENwg7xEFcYObjmT.json
+++ b/src/packs/adversaries/adversary_Hallowed_Soldier_VENwg7xEFcYObjmT.json
@@ -104,7 +104,8 @@
       "source": "Daggerheart SRD",
       "page": 98,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "VENwg7xEFcYObjmT",
@@ -213,7 +214,7 @@
       "name": "Minion (13)",
       "type": "feature",
       "system": {
-        "description": "<p>The Soldier is defeated when they take any damage. For every 13 damage a PC deals to the Soldier, defeat an additional Minion within range the attack would succeed against.</p>",
+        "description": "<p>The @Lookup[@name] is defeated when they take any damage. For every 13 damage a PC deals to the @Lookup[@name], defeat an additional Minion within range the attack would succeed against.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -238,14 +239,14 @@
       "name": "Divine Flight",
       "type": "feature",
       "system": {
-        "description": "<p>While the Soldier is flying, <strong>spend a Fear</strong> to move up to Far range instead of Close range before taking an action.</p>",
+        "description": "<p>While the @Lookup[@name] is flying, <strong>spend a Fear</strong> to move up to Far range instead of Close range before taking an action.</p>",
         "resource": null,
         "actions": {
           "aCRmnQ5n7FrbQykj": {
             "type": "effect",
             "_id": "aCRmnQ5n7FrbQykj",
             "systemPath": "actions",
-            "description": "<p>While the Soldier is flying, <strong>spend a Fear</strong> to move up to Far range instead of Close range before taking an action.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -293,14 +294,14 @@
       "name": "Group Attack",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all Hallowed Soldiers within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 10 physical damage each. Combine this damage.</p>",
+        "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all @Lookup[@name]s within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 10 physical damage each. Combine this damage.</p>",
         "resource": null,
         "actions": {
           "eo7J0v1B5zPHul1M": {
             "type": "effect",
             "_id": "eo7J0v1B5zPHul1M",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all Hallowed Soldiers within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 10 physical damage each. Combine this damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -327,7 +328,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "ZpypjDbaurs1YSFb",
       "img": "icons/creatures/abilities/tail-strike-bone-orange.webp",
diff --git a/src/packs/adversaries/adversary_Harrier_uRtghKE9mHlII4rs.json b/src/packs/adversaries/adversary_Harrier_uRtghKE9mHlII4rs.json
index b2ebe434..89d82a0b 100644
--- a/src/packs/adversaries/adversary_Harrier_uRtghKE9mHlII4rs.json
+++ b/src/packs/adversaries/adversary_Harrier_uRtghKE9mHlII4rs.json
@@ -116,7 +116,8 @@
       "source": "Daggerheart SRD",
       "page": 77,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "uRtghKE9mHlII4rs",
@@ -227,7 +228,7 @@
       "_id": "t9Fa5jKLhvjD8Ar2",
       "img": "icons/skills/movement/arrow-upward-blue.webp",
       "system": {
-        "description": "<p>After making a standard attack, the Harrier can move anywhere within Far range.</p>",
+        "description": "<p>After making a standard attack, the @Lookup[@name] can move anywhere within Far range.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -260,7 +261,7 @@
             "type": "attack",
             "_id": "FiuiLUbNUL0YKq7w",
             "systemPath": "actions",
-            "description": "<p>When a creature moves into Melee range to make an attack, you can <strong>mark a Stress</strong> before the attack roll to move anywhere within Close range and make an attack against that creature. On a success, deal <strong>1d10+2</strong> physical damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -339,7 +340,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "effects": [],
       "folder": null,
diff --git a/src/packs/adversaries/adversary_Head_Guard_mK3A5FTx6k8iPU3F.json b/src/packs/adversaries/adversary_Head_Guard_mK3A5FTx6k8iPU3F.json
index e0e2a946..75afed49 100644
--- a/src/packs/adversaries/adversary_Head_Guard_mK3A5FTx6k8iPU3F.json
+++ b/src/packs/adversaries/adversary_Head_Guard_mK3A5FTx6k8iPU3F.json
@@ -122,7 +122,8 @@
       "source": "Daggerheart SRD",
       "page": 77,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "mK3A5FTx6k8iPU3F",
@@ -233,14 +234,14 @@
       "_id": "SsgN2qSYpQLR43Cz",
       "img": "icons/skills/movement/arrows-up-trio-red.webp",
       "system": {
-        "description": "<p><strong>Spend 2 Fear</strong> to spotlight the Head Guard and up to <strong>2d4</strong> allies within Far range.</p><p>@Template[type:emanation|range:f]</p>",
+        "description": "<p><strong>Spend 2 Fear</strong> to spotlight the @Lookup[@name] and up to <strong>2d4</strong> allies within Far range.</p><p>@Template[type:emanation|range:f]</p>",
         "resource": null,
         "actions": {
           "lI0lnRb3xrUjqIYX": {
             "type": "attack",
             "_id": "lI0lnRb3xrUjqIYX",
             "systemPath": "actions",
-            "description": "<p><strong>Spend 2 Fear</strong> to spotlight the Head Guard and up to <strong>2d4</strong> allies within Far range.</p><p>@Template[type:emanation|range:f]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -292,7 +293,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
@@ -313,14 +315,14 @@
       "_id": "YeJ7eJVCKsRxG8mk",
       "img": "icons/skills/ranged/target-bullseye-arrow-blue.webp",
       "system": {
-        "description": "<p><em>Countdown (5)</em>. When the Head Guard is in the spotlight for the first time, activate the countdown. It ticks down when a PC makes an attack roll. When it triggers, all Archer Guards within Far range make a standard attack with advantage against the nearest target within their range. If any attacks succeed on the same target, combine their damage.</p><p>@Template[type:emanation|range:f]</p>",
+        "description": "<p><em>Countdown (5)</em>. When the @Lookup[@name] is in the spotlight for the first time, activate the countdown. It ticks down when a PC makes an attack roll. When it triggers, all Archer Guards within Far range make a standard attack with advantage against the nearest target within their range. If any attacks succeed on the same target, combine their damage.</p><p>@Template[type:emanation|range:f]</p>",
         "resource": null,
         "actions": {
           "xyhaCmPGiVMsTViH": {
             "type": "countdown",
             "_id": "xyhaCmPGiVMsTViH",
             "systemPath": "actions",
-            "description": "<p><em>Countdown (5)</em>. When the Head Guard is in the spotlight for the first time, activate the countdown. It ticks down when a PC makes an attack roll. When it triggers, all Archer Guards within Far range make a standard attack with advantage against the nearest target within their range. If any attacks succeed on the same target, combine their damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "originItem": {
               "type": "itemCollection"
@@ -356,7 +358,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "effects": [],
       "folder": null,
@@ -377,14 +380,14 @@
       "_id": "sd2OlhLchyoqeKke",
       "img": "icons/skills/melee/strike-weapons-orange.webp",
       "system": {
-        "description": "<p>When the Head Guard makes a successful attack against a PC, you gain a Fear.</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack against a PC, you gain a Fear.</p>",
         "resource": null,
         "actions": {
           "tD1hAwP6scxXrouw": {
             "type": "healing",
             "_id": "tD1hAwP6scxXrouw",
             "systemPath": "actions",
-            "description": "<p>When the Head Guard makes a successful attack against a PC, you gain a Fear.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "reaction",
             "cost": [],
@@ -452,7 +455,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "effects": [],
       "folder": null,
diff --git a/src/packs/adversaries/adversary_Head_Vampire_i2UNbRvgyoSs07M6.json b/src/packs/adversaries/adversary_Head_Vampire_i2UNbRvgyoSs07M6.json
index 0c22e7fa..9e948594 100644
--- a/src/packs/adversaries/adversary_Head_Vampire_i2UNbRvgyoSs07M6.json
+++ b/src/packs/adversaries/adversary_Head_Vampire_i2UNbRvgyoSs07M6.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 95,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "i2UNbRvgyoSs07M6",
@@ -226,14 +227,14 @@
       "name": "Terrifying",
       "type": "feature",
       "system": {
-        "description": "<p>When the Vampire makes a successful attack, all PCs within Far range lose a Hope and you gain a Fear.</p><p>@Template[type:emanation|range:f]</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack, all PCs within Far range lose a Hope and you gain a Fear.</p><p>@Template[type:emanation|range:f]</p>",
         "resource": null,
         "actions": {
           "Rf2ZL3EjCzudonRb": {
             "type": "damage",
             "_id": "Rf2ZL3EjCzudonRb",
             "systemPath": "actions",
-            "description": "<p>When the Vampire makes a successful attack, all PCs within Far range lose a Hope and you gain a Fear.</p><p>@Template[type:emanation|range:f]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -304,14 +305,14 @@
       "name": "Look into My Eyes",
       "type": "feature",
       "system": {
-        "description": "<p>A creature who moves into Melee range of the Vampire must make an Instinct Reaction Roll. On a failure, you gain <strong>[[/r 1d4]]</strong> Fear.</p>",
+        "description": "<p>A creature who moves into Melee range of the @Lookup[@name] must make an Instinct Reaction Roll. On a failure, you gain <strong>[[/r 1d4]]</strong> Fear.</p>",
         "resource": null,
         "actions": {
           "lOgkZTR1hybc6bnJ": {
             "type": "attack",
             "_id": "lOgkZTR1hybc6bnJ",
             "systemPath": "actions",
-            "description": "<p>A creature who moves into Melee range of the Vampire must make an Instinct Reaction Roll. On a failure, you gain <strong>[[/r 1d4]]</strong> Fear.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -376,14 +377,14 @@
       "name": "Feed on Followers",
       "type": "feature",
       "system": {
-        "description": "<p>When the Vampire is within Melee range of an ally, they can cause the ally to mark a HP. The Vampire then clears a HP.</p>",
+        "description": "<p>When the @Lookup[@name] is within Melee range of an ally, they can cause the ally to mark a HP. The @Lookup[@name] then clears a HP.</p>",
         "resource": null,
         "actions": {
           "tM6TBTtmCXTnIzen": {
             "type": "healing",
             "_id": "tM6TBTtmCXTnIzen",
             "systemPath": "actions",
-            "description": "<p>When the Vampire is within Melee range of an ally, they can cause the ally to mark a HP. The Vampire then clears a HP.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -448,7 +449,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "Oj6qkLG1N6uqQHcx",
       "img": "icons/creatures/abilities/fang-tooth-blood-red.webp",
@@ -476,7 +478,7 @@
             "type": "effect",
             "_id": "5Q6RMUTiauKw0tDj",
             "systemPath": "actions",
-            "description": "<p><strong>Spend 2 Fear</strong> to summon [[/r 1d4]] @UUID[Compendium.daggerheart.adversaries.Actor.WWyUp6Mxl1S3KYUG]{Vampires}, who appear at Far range and immediately take the spotlight.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -503,7 +505,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "IWtpuQCuV82lOSry",
       "img": "icons/creatures/mammals/bat-giant-tattered-purple.webp",
@@ -524,14 +527,14 @@
       "name": "Lifesuck",
       "type": "feature",
       "system": {
-        "description": "<p>When the Vampire is spotlighted, roll a <strong>d8</strong>. On a result of 6 or higher, all targets within Very Close range must mark a HP.</p><p>@Template[type:emanation|range:vc]</p>",
+        "description": "<p>When the @Lookup[@name] is spotlighted, roll a <strong>d8</strong>. On a result of 6 or higher, all targets within Very Close range must mark a HP.</p><p>@Template[type:emanation|range:vc]</p>",
         "resource": null,
         "actions": {
           "DA8qT2omBcG4oryX": {
             "type": "attack",
             "_id": "DA8qT2omBcG4oryX",
             "systemPath": "actions",
-            "description": "<p>When the Vampire is spotlighted, roll a <strong>d8</strong>. On a result of 6 or higher, all targets within Very Close range must mark a HP.</p><p>@Template[type:emanation|range:vc]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -601,7 +604,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "6FsQf339qGHnz3ZF",
       "img": "icons/magic/unholy/strike-beam-blood-small-red-purple.webp",
diff --git a/src/packs/adversaries/adversary_High_Seraph_r1mbfSSwKWdcFdAU.json b/src/packs/adversaries/adversary_High_Seraph_r1mbfSSwKWdcFdAU.json
index d03fdea1..0a952540 100644
--- a/src/packs/adversaries/adversary_High_Seraph_r1mbfSSwKWdcFdAU.json
+++ b/src/packs/adversaries/adversary_High_Seraph_r1mbfSSwKWdcFdAU.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 98,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "r1mbfSSwKWdcFdAU",
@@ -226,14 +227,14 @@
       "name": "Relentless (3)",
       "type": "feature",
       "system": {
-        "description": "<p>The Seraph can be spotlighted up to three times per GM turn. Spend Fear as usual to spotlight them.</p>",
+        "description": "<p>The @Lookup[@name] can be spotlighted up to three times per GM turn. Spend Fear as usual to spotlight them.</p>",
         "resource": null,
         "actions": {
           "7oqXSF66R2GlB17O": {
             "type": "effect",
             "_id": "7oqXSF66R2GlB17O",
             "systemPath": "actions",
-            "description": "<p>The Seraph can be spotlighted up to three times per GM turn. Spend Fear as usual to spotlight them.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "passive",
             "cost": [
@@ -284,14 +285,14 @@
       "name": "Divine Flight",
       "type": "feature",
       "system": {
-        "description": "<p>While the Seraph is flying, <strong>spend a Fear</strong> to move up to Far range instead of Close range before taking an action.</p>",
+        "description": "<p>While the @Lookup[@name] is flying, <strong>spend a Fear</strong> to move up to Far range instead of Close range before taking an action.</p>",
         "resource": null,
         "actions": {
           "ZgspQLiGhuKURA1T": {
             "type": "effect",
             "_id": "ZgspQLiGhuKURA1T",
             "systemPath": "actions",
-            "description": "<p>While the Seraph is flying, <strong>spend a Fear</strong> to move up to Far range instead of Close range before taking an action.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -339,14 +340,14 @@
       "name": "Judgement",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Spend a Fear</strong> to make a target Guilty in the eyes of the Seraph’s god until the Seraph is defeated. While Guilty, the target doesn’t gain Hope on a result with Hope. When the Seraph succeeds on a standard attack against a Guilty target, they deal Severe damage instead of their standard damage. The Seraph can only mark one target at a time.</p>",
+        "description": "<p><strong>Spend a Fear</strong> to make a target Guilty in the eyes of the Seraph’s god until the @Lookup[@name] is defeated. While Guilty, the target doesn’t gain Hope on a result with Hope. When the @Lookup[@name] succeeds on a standard attack against a Guilty target, they deal Severe damage instead of their standard damage. The @Lookup[@name] can only mark one target at a time.</p>",
         "resource": null,
         "actions": {
           "ErGJWtFIXFPgKtek": {
             "type": "effect",
             "_id": "ErGJWtFIXFPgKtek",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to make a target Guilty in the eyes of the Seraph’s god until the Seraph is defeated. While Guilty, the target doesn’t gain Hope on a result with Hope. When the Seraph succeeds on a standard attack against a Guilty target, they deal Severe damage instead of their standard damage. The Seraph can only mark one target at a time.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -371,7 +372,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "FilEB21L5q9XxKE1",
       "img": "icons/magic/light/beams-rays-orange-purple-small.webp",
@@ -436,7 +438,7 @@
             "type": "attack",
             "_id": "HwC75gazlN0k30AL",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to reflect a sliver of divinity as a searing beam of light that hits up to twenty targets within Very Far range. Targets must make a Presence Reaction Roll, with disadvantage if they are marked Guilty. Targets who fail take <strong>4d6+12</strong> magic damage. Targets who succeed take half damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -514,7 +516,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "Vrb8dIJcOJ3ClwO5",
       "img": "icons/magic/light/beam-strike-orange-gold.webp",
@@ -542,7 +545,7 @@
             "type": "effect",
             "_id": "j6DmU9dtob5QStxY",
             "systemPath": "actions",
-            "description": "<p>Once per scene, <strong>spend a Fear</strong> to spotlight all other adversaries within Far range. Attacks they make while spotlighted in this way deal half damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -569,7 +572,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "9LpLXpQBfQryJA60",
       "img": "icons/magic/holy/barrier-shield-winged-blue.webp",
diff --git a/src/packs/adversaries/adversary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json b/src/packs/adversaries/adversary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json
index 9341c9ab..6f64f883 100644
--- a/src/packs/adversaries/adversary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json
+++ b/src/packs/adversaries/adversary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 94,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "_id": "6hbqmxDXFOzZJDk4",
@@ -226,7 +227,7 @@
       "name": "Slow",
       "type": "feature",
       "system": {
-        "description": "<p>When you spotlight the Ooze and they don’t have a token on their stat block, they can’t act yet. Place a token on their stat block and describe what they’re preparing to do. When you spotlight the Ooze and they have a token on their stat block, clear the token and they can act.</p>",
+        "description": "<p>When you spotlight the @Lookup[@name] and they don’t have a token on their stat block, they can’t act yet. Place a token on their stat block and describe what they’re preparing to do. When you spotlight the @Lookup[@name] and they have a token on their stat block, clear the token and they can act.</p>",
         "resource": {
           "type": "simple",
           "value": 0,
@@ -256,14 +257,14 @@
       "name": "Acidic Form",
       "type": "feature",
       "system": {
-        "description": "<p>When the Ooze makes a successful attack, the target must mark an Armor Slot without receiving its benefi ts (they can still use armor to reduce the damage). If they can’t mark an Armor Slot, they must mark an additional HP.</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack, the target must mark an Armor Slot without receiving its benefi ts (they can still use armor to reduce the damage). If they can’t mark an Armor Slot, they must mark an additional HP.</p>",
         "resource": null,
         "actions": {
           "gtT2oHSyZg9OHHJD": {
             "type": "damage",
             "_id": "gtT2oHSyZg9OHHJD",
             "systemPath": "actions",
-            "description": "<p>When the Ooze makes a successful attack, the target must mark an Armor Slot without receiving its benefi ts (they can still use armor to reduce the damage). If they can’t mark an Armor Slot, they must mark an additional HP.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -334,7 +335,7 @@
       "name": "Envelop",
       "type": "feature",
       "system": {
-        "description": "<p>Make an attack against a target within Melee range. On a success, the Ooze Envelops them and the target must mark 2 Stress. While Enveloped, the target must mark an additional Stress every time they make an action roll. When the Ooze takes Severe damage, all Enveloped targets are freed and the condition is cleared.</p>",
+        "description": "<p>Make an attack against a target within Melee range. On a success, the @Lookup[@name] Envelops them and the target must mark 2 Stress. While Enveloped, the target must mark an additional Stress every time they make an action roll. When the @Lookup[@name] takes Severe damage, all Enveloped targets are freed and the condition is cleared.</p>",
         "resource": null,
         "actions": {
           "hQBYPagz5yuTcCQq": {
@@ -416,7 +417,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "pfXYuH7rtsyVjSXh",
       "img": "icons/creatures/slimes/slime-face-melting-green.webp",
@@ -474,14 +476,14 @@
       "name": "Split",
       "type": "feature",
       "system": {
-        "description": "<p>When the Ooze has 4 or more HP marked, you can <strong>spend a Fear</strong> to split them into two @UUID[Compendium.daggerheart.adversaries.Actor.SHXedd9zZPVfUgUa]{Green Oozes}(with no marked HP or Stress). Immediately spotlight both of them.</p>",
+        "description": "<p>When the @Lookup[@name] has 4 or more HP marked, you can <strong>spend a Fear</strong> to split them into two @UUID[Compendium.daggerheart.adversaries.Actor.SHXedd9zZPVfUgUa]{Green Oozes}(with no marked HP or Stress). Immediately spotlight both of them.</p>",
         "resource": null,
         "actions": {
           "iQsYAqpUFvJslRDr": {
             "type": "effect",
             "_id": "iQsYAqpUFvJslRDr",
             "systemPath": "actions",
-            "description": "<p>When the Ooze has 4 or more HP marked, you can <strong>spend a Fear</strong> to split them into two @UUID[Compendium.daggerheart.adversaries.Actor.SHXedd9zZPVfUgUa]{Green Oozes}(with no marked HP or Stress). Immediately spotlight both of them.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -508,7 +510,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "Mq90kFBM5ix2pzzh",
       "img": "icons/creatures/slimes/slime-movement-pseudopods-green.webp",
diff --git a/src/packs/adversaries/adversary_Hydra_MI126iMOOobQ1Obn.json b/src/packs/adversaries/adversary_Hydra_MI126iMOOobQ1Obn.json
index 0bc04c03..4c6fd61f 100644
--- a/src/packs/adversaries/adversary_Hydra_MI126iMOOobQ1Obn.json
+++ b/src/packs/adversaries/adversary_Hydra_MI126iMOOobQ1Obn.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 94,
       "artist": ""
-    }
+    },
+    "size": "huge"
   },
   "flags": {},
   "_id": "MI126iMOOobQ1Obn",
@@ -220,7 +221,7 @@
       "name": "Many-Headed Menace",
       "type": "feature",
       "system": {
-        "description": "<p>The Hydra begins with three heads and can have up to five. When the Hydra takes Major or greater damage, they lose a head.</p>",
+        "description": "<p>The @Lookup[@name] begins with three heads and can have up to five. When the @Lookup[@name] takes Major or greater damage, they lose a head.</p>",
         "resource": {
           "type": "simple",
           "value": 3,
@@ -250,7 +251,7 @@
       "name": "Relentless (X)",
       "type": "feature",
       "system": {
-        "description": "<p>The Hydra can be spotlighted X times per GM turn, where X is the Hydra’s number of heads. Spend Fear as usual to spotlight them. <br /><br />Note: Automation is not added so manually spend fear as per text.</p>",
+        "description": "<p>The @Lookup[@name] can be spotlighted X times per GM turn, where X is the @Lookup[@name]’s number of heads. Spend Fear as usual to spotlight them.</p><section class=\"secret\" id=\"secret-AOW6OiOMzL5FUfWv\"><p><br />Note: Automation is not added so manually spend fear as per text.</p></section>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -275,14 +276,14 @@
       "name": "Regeneration",
       "type": "feature",
       "system": {
-        "description": "<p>If the Hydra has any marked HP, <strong>spend a Fear</strong> to clear a HP and grow two heads.</p>",
+        "description": "<p>If the @Lookup[@name] has any marked HP, <strong>spend a Fear</strong> to clear a HP and grow two heads.</p>",
         "resource": null,
         "actions": {
           "SsRtZwee1mYlPLUy": {
             "type": "healing",
             "_id": "SsRtZwee1mYlPLUy",
             "systemPath": "actions",
-            "description": "<p>If the Hydra has any marked HP, <strong>spend a Fear</strong> to clear a HP and grow two heads.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -354,7 +355,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "b2KflqWoOxHMQf97",
       "img": "icons/magic/life/cross-beam-green.webp",
@@ -382,7 +384,7 @@
             "type": "damage",
             "_id": "nJxpFR4Ul0e2RrL4",
             "systemPath": "actions",
-            "description": "<p>All PCs within Far range lose 2 Hope.</p><p>@Template[type:emanation|range:f]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -432,7 +434,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "bCeCu8M25izOAsuY",
       "img": "icons/magic/death/skull-energy-light-white.webp",
@@ -453,7 +456,7 @@
       "name": "Magical Weakness",
       "type": "feature",
       "system": {
-        "description": "<p>When the Hydra takes magic damage, they become Dazed until the next roll with Fear. While Dazed, they can’t use their Regeneration action but are immune to magic damage.</p>",
+        "description": "<p>When the @Lookup[@name] takes magic damage, they become Dazed until the next roll with Fear. While Dazed, they can’t use their Regeneration action but are immune to magic damage.</p>",
         "resource": null,
         "actions": {
           "heAkvOuQG1EJmVbb": {
@@ -485,7 +488,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "sJzjcRBgYRp5f53E",
       "img": "icons/magic/symbols/star-rising-purple.webp",
diff --git a/src/packs/adversaries/adversary_Jagged_Knife_Bandit_5Lh1T0zaT8Pkr2U2.json b/src/packs/adversaries/adversary_Jagged_Knife_Bandit_5Lh1T0zaT8Pkr2U2.json
index 8828c612..ae359eaf 100644
--- a/src/packs/adversaries/adversary_Jagged_Knife_Bandit_5Lh1T0zaT8Pkr2U2.json
+++ b/src/packs/adversaries/adversary_Jagged_Knife_Bandit_5Lh1T0zaT8Pkr2U2.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 77,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "5Lh1T0zaT8Pkr2U2",
@@ -228,7 +229,7 @@
       "_id": "5VPb3OJDv6Q5150r",
       "img": "icons/skills/movement/arrow-upward-white.webp",
       "system": {
-        "description": "<p>The Bandit climbs just as easily as they run.</p>",
+        "description": "<p>The @Lookup[@name] climbs just as easily as they run.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -254,14 +255,14 @@
       "_id": "V7haVmSLm6vTeffc",
       "img": "icons/skills/movement/arrow-down-pink.webp",
       "system": {
-        "description": "<p>When the Bandit succeeds on a standard attack from above a target, they deal <strong>1d10+1</strong> physical damage instead of their standard damage.</p>",
+        "description": "<p>When the @Lookup[@name] succeeds on a standard attack from above a target, they deal <strong>1d10+1</strong> physical damage instead of their standard damage.</p>",
         "resource": null,
         "actions": {
           "X7xdCLY7ySMpaTHe": {
             "type": "damage",
             "_id": "X7xdCLY7ySMpaTHe",
             "systemPath": "actions",
-            "description": "<p>When the Bandit succeeds on a standard attack from above a target, they deal <strong>1d10+1</strong> physical damage instead of their standard damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
diff --git a/src/packs/adversaries/adversary_Jagged_Knife_Hexer_MbBPIOxaxXYNApXz.json b/src/packs/adversaries/adversary_Jagged_Knife_Hexer_MbBPIOxaxXYNApXz.json
index 465dd7a2..6ca9749c 100644
--- a/src/packs/adversaries/adversary_Jagged_Knife_Hexer_MbBPIOxaxXYNApXz.json
+++ b/src/packs/adversaries/adversary_Jagged_Knife_Hexer_MbBPIOxaxXYNApXz.json
@@ -116,7 +116,8 @@
       "source": "Daggerheart SRD",
       "page": 78,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "MbBPIOxaxXYNApXz",
@@ -234,7 +235,7 @@
             "type": "effect",
             "_id": "yzjCJyfGzZrEd0G3",
             "systemPath": "actions",
-            "description": "<p>Choose a target within Far range and temporarily Curse them. While the target is Cursed, you can <strong>mark a Stress</strong> when that target rolls with Hope to make the roll be with Fear instead.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -260,7 +261,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [
         {
@@ -318,14 +320,14 @@
       "_id": "d8uVdKpTm9yw6TZS",
       "img": "icons/magic/unholy/projectile-bolts-salvo-pink.webp",
       "system": {
-        "description": "<p>Make an attack against up to three targets within Very Close range. <strong>Mark a Stress</strong> to deal <strong>2d6+3</strong> magic damage to targets the Hexer succeeded against.</p>",
+        "description": "<p>Make an attack against up to three targets within Very Close range. <strong>Mark a Stress</strong> to deal <strong>2d6+3</strong> magic damage to targets the @Lookup[@name] succeeded against.</p>",
         "resource": null,
         "actions": {
           "HmvmqoMli6oC2y2a": {
             "type": "attack",
             "_id": "HmvmqoMli6oC2y2a",
             "systemPath": "actions",
-            "description": "<p>Make an attack against up to three targets within Very Close range. <strong>Mark a Stress</strong> to deal <strong>2d6+3</strong> magic damage to targets the Hexer succeeded against.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -397,7 +399,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
diff --git a/src/packs/adversaries/adversary_Jagged_Knife_Kneebreaker_CBKixLH3yhivZZuL.json b/src/packs/adversaries/adversary_Jagged_Knife_Kneebreaker_CBKixLH3yhivZZuL.json
index e7ec011d..fc644604 100644
--- a/src/packs/adversaries/adversary_Jagged_Knife_Kneebreaker_CBKixLH3yhivZZuL.json
+++ b/src/packs/adversaries/adversary_Jagged_Knife_Kneebreaker_CBKixLH3yhivZZuL.json
@@ -122,7 +122,8 @@
       "source": "Daggerheart SRD",
       "page": 78,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "CBKixLH3yhivZZuL",
@@ -233,7 +234,7 @@
       "_id": "vipYd2zMFs0i4Ock",
       "img": "icons/commodities/metal/chain-silver.webp",
       "system": {
-        "description": "<p>Creatures <em>Restrained</em> by the Kneebreaker take double damage from attacks by other adversaries.</p>",
+        "description": "<p>Creatures <em>Restrained</em> by the @Lookup[@name] take double damage from attacks by other adversaries.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -259,14 +260,14 @@
       "_id": "Sa4Nt0eoDjirBKGf",
       "img": "icons/skills/melee/unarmed-punch-fist.webp",
       "system": {
-        "description": "<p>Make an attack against a target within Melee range. On a success, the target takes no damage but is Restrained and <em>Vulnerable</em>. The target can break free, clearing both conditions, with a successful Strength Roll or is freed automatically if the Kneebreaker takes Major or greater damage.</p>",
+        "description": "<p>Make an attack against a target within Melee range. On a success, the target takes no damage but is Restrained and <em>Vulnerable</em>. The target can break free, clearing both conditions, with a successful Strength Roll or is freed automatically if the @Lookup[@name] takes Major or greater damage.</p>",
         "resource": null,
         "actions": {
           "uMNSQzNPVPhHT34T": {
             "type": "attack",
             "_id": "uMNSQzNPVPhHT34T",
             "systemPath": "actions",
-            "description": "<p>Make an attack against a target within Melee range. On a success, the target takes no damage but is Restrained and <em>Vulnerable</em>. The target can break free, clearing both conditions, with a successful Strength Roll or is freed automatically if the Kneebreaker takes Major or greater damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -316,7 +317,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [
         {
diff --git a/src/packs/adversaries/adversary_Jagged_Knife_Lackey_C0OMQqV7pN6t7ouR.json b/src/packs/adversaries/adversary_Jagged_Knife_Lackey_C0OMQqV7pN6t7ouR.json
index 99381bd6..1a95bf87 100644
--- a/src/packs/adversaries/adversary_Jagged_Knife_Lackey_C0OMQqV7pN6t7ouR.json
+++ b/src/packs/adversaries/adversary_Jagged_Knife_Lackey_C0OMQqV7pN6t7ouR.json
@@ -110,7 +110,8 @@
       "source": "Daggerheart SRD",
       "page": 78,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "C0OMQqV7pN6t7ouR",
@@ -221,7 +222,7 @@
       "_id": "hfP30YIlYDW9wkHe",
       "img": "icons/magic/symbols/runes-carved-stone-yellow.webp",
       "system": {
-        "description": "<p>The Lackey is defeated when they take any damage. For every 3 damage a PC deals to the Lackey, defeat an additional Minion within range the attack would succeed against.</p>",
+        "description": "<p>The @Lookup[@name] is defeated when they take any damage. For every 3 damage a PC deals to the @Lookup[@name], defeat an additional Minion within range the attack would succeed against.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -247,14 +248,14 @@
       "_id": "1k5TmQIAunM7Bv32",
       "img": "icons/creatures/abilities/tail-strike-bone-orange.webp",
       "system": {
-        "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all Jagged Knife Lackeys within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 2 physical damage each. Combine this damage.</p>",
+        "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all @Lookup[@name] within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 2 physical damage each. Combine this damage.</p>",
         "resource": null,
         "actions": {
           "aoQDb2m32NDxE6ZP": {
             "type": "effect",
             "_id": "aoQDb2m32NDxE6ZP",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all Jagged Knife Lackeys within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 2 physical damage each. Combine this damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -282,7 +283,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
diff --git a/src/packs/adversaries/adversary_Jagged_Knife_Lieutenant_aTljstqteGoLpCBq.json b/src/packs/adversaries/adversary_Jagged_Knife_Lieutenant_aTljstqteGoLpCBq.json
index 7e448a62..165bb160 100644
--- a/src/packs/adversaries/adversary_Jagged_Knife_Lieutenant_aTljstqteGoLpCBq.json
+++ b/src/packs/adversaries/adversary_Jagged_Knife_Lieutenant_aTljstqteGoLpCBq.json
@@ -116,7 +116,8 @@
       "source": "Daggerheart SRD",
       "page": 78,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "aTljstqteGoLpCBq",
@@ -227,14 +228,14 @@
       "_id": "LIAbel7pMzAHpgF3",
       "img": "icons/skills/movement/arrows-up-trio-red.webp",
       "system": {
-        "description": "<p>When you spotlight the Lieutenant, <strong>mark a Stress</strong> to also spotlight two allies within Close range.</p>",
+        "description": "<p>When you spotlight the @Lookup[@name], <strong>mark a Stress</strong> to also spotlight two allies within Close range.</p>",
         "resource": null,
         "actions": {
           "IfMFU67g4sfhSYtm": {
             "type": "effect",
             "_id": "IfMFU67g4sfhSYtm",
             "systemPath": "actions",
-            "description": "<p>When you spotlight the Lieutenant, <strong>mark a Stress</strong> to also spotlight two allies within Close range.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -262,7 +263,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
@@ -288,7 +290,8 @@
         "actions": {},
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
@@ -316,7 +319,7 @@
             "type": "attack",
             "_id": "fzVyO0DUwIVEUCtg",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to make an attack against a Vulnerable target within Close range. On a success, deal <strong>2d6+12</strong> physical damage and the target must mark a Stress.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -420,7 +423,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
@@ -441,14 +445,14 @@
       "_id": "uelnRgGStjJ27VtO",
       "img": "icons/skills/melee/strike-weapons-orange.webp",
       "system": {
-        "description": "<p>When the Lieutenant makes a successful attack against a PC, you gain a Fear.</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack against a PC, you gain a Fear.</p>",
         "resource": null,
         "actions": {
           "GSjfSgBzyhbVcpbt": {
             "type": "healing",
             "_id": "GSjfSgBzyhbVcpbt",
             "systemPath": "actions",
-            "description": "<p>When the Lieutenant makes a successful attack against a PC, you gain a Fear.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -516,7 +520,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "effects": [],
       "folder": null,
diff --git a/src/packs/adversaries/adversary_Jagged_Knife_Shadow_XF4tYTq9nPJAy2ox.json b/src/packs/adversaries/adversary_Jagged_Knife_Shadow_XF4tYTq9nPJAy2ox.json
index 10dc241f..bca035c1 100644
--- a/src/packs/adversaries/adversary_Jagged_Knife_Shadow_XF4tYTq9nPJAy2ox.json
+++ b/src/packs/adversaries/adversary_Jagged_Knife_Shadow_XF4tYTq9nPJAy2ox.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 78,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "XF4tYTq9nPJAy2ox",
@@ -228,14 +229,14 @@
       "_id": "dhycdSd4NYdPOYbP",
       "img": "icons/weapons/daggers/dagger-crooked-ice-blue.webp",
       "system": {
-        "description": "<p>When the Shadow succeeds on a standard attack that has advantage, they deal 1d6+6 physical damage instead of their standard damage.</p>",
+        "description": "<p>When the @Lookup[@name] succeeds on a standard attack that has advantage, they deal 1d6+6 physical damage instead of their standard damage.</p>",
         "resource": null,
         "actions": {
           "6G5Dasl1pP8pfYkZ": {
             "type": "attack",
             "_id": "6G5Dasl1pP8pfYkZ",
             "systemPath": "actions",
-            "description": "<p>When the Shadow succeeds on a standard attack that has advantage, they deal 1d6+6 physical damage instead of their standard damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -328,14 +329,14 @@
       "_id": "ILIogeKbYioPutRw",
       "img": "icons/magic/perception/silhouette-stealth-shadow.webp",
       "system": {
-        "description": "<p>Become <em>Hidden</em> until after the Shadow’s next attack. Attacks made while Hidden from this feature have advantage.</p>",
+        "description": "<p>Become <em>Hidden</em> until after the @Lookup[@name]’s next attack. Attacks made while Hidden from this feature have advantage.</p>",
         "resource": null,
         "actions": {
           "s0X44RPg5hA8lVax": {
             "type": "effect",
             "_id": "s0X44RPg5hA8lVax",
             "systemPath": "actions",
-            "description": "<p>Become <em>Hidden</em> until after the Shadow’s next attack. Attacks made while Hidden from this feature have advantage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -362,7 +363,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [
         {
diff --git a/src/packs/adversaries/adversary_Jagged_Knife_Sniper_1zuyof1XuIfi3aMG.json b/src/packs/adversaries/adversary_Jagged_Knife_Sniper_1zuyof1XuIfi3aMG.json
index 968e227a..166c521b 100644
--- a/src/packs/adversaries/adversary_Jagged_Knife_Sniper_1zuyof1XuIfi3aMG.json
+++ b/src/packs/adversaries/adversary_Jagged_Knife_Sniper_1zuyof1XuIfi3aMG.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 78,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "1zuyof1XuIfi3aMG",
@@ -228,14 +229,14 @@
       "_id": "adPXzpvLREjN3len",
       "img": "icons/skills/ranged/arrow-flying-spiral-blue.webp",
       "system": {
-        "description": "<p>If the Sniper is <em>Hidden</em> when they make a successful standard attack against a target, they deal <strong>1d10+4</strong> physical damage instead of their standard damage.</p>",
+        "description": "<p>If the @Lookup[@name] is <em>Hidden</em> when they make a successful standard attack against a target, they deal <strong>1d10+4</strong> physical damage instead of their standard damage.</p>",
         "resource": null,
         "actions": {
           "2eX7P0wSfbKKu8dJ": {
             "type": "attack",
             "_id": "2eX7P0wSfbKKu8dJ",
             "systemPath": "actions",
-            "description": "<p>If the Sniper is <em>Hidden</em> when they make a successful standard attack against a target, they deal <strong>1d10+4</strong> physical damage instead of their standard damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
diff --git a/src/packs/adversaries/adversary_Juvenile_Flickerfly_MYXmTx2FHcIjdfYZ.json b/src/packs/adversaries/adversary_Juvenile_Flickerfly_MYXmTx2FHcIjdfYZ.json
index 25b0b8b0..86d69c37 100644
--- a/src/packs/adversaries/adversary_Juvenile_Flickerfly_MYXmTx2FHcIjdfYZ.json
+++ b/src/packs/adversaries/adversary_Juvenile_Flickerfly_MYXmTx2FHcIjdfYZ.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 88,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "_id": "MYXmTx2FHcIjdfYZ",
@@ -220,14 +221,14 @@
       "name": "Relentless (3)",
       "type": "feature",
       "system": {
-        "description": "<p>The Flickerfly can be spotlighted up to three times per GM turn. Spend Fear as usual to spotlight them.</p>",
+        "description": "<p>The @Lookup[@name] can be spotlighted up to three times per GM turn. Spend Fear as usual to spotlight them.</p>",
         "resource": null,
         "actions": {
           "FgoP6tlMUxnv5k4Z": {
             "type": "effect",
             "_id": "FgoP6tlMUxnv5k4Z",
             "systemPath": "actions",
-            "description": "<p>The Flickerfly can be spotlighted up to three times per GM turn. Spend Fear as usual to spotlight them.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "passive",
             "cost": [
@@ -278,14 +279,14 @@
       "name": "Peerless Accuracy",
       "type": "feature",
       "system": {
-        "description": "<p>Before the Flickerfly makes an attack, roll a d6. On a result of 4 or higher, the target’s Evasion is halved against this attack.</p>",
+        "description": "<p>Before the @Lookup[@name] makes an attack, roll a d6. On a result of 4 or higher, the target’s Evasion is halved against this attack.</p>",
         "resource": null,
         "actions": {
           "RrKQktP8MI4YQR5k": {
             "type": "attack",
             "_id": "RrKQktP8MI4YQR5k",
             "systemPath": "actions",
-            "description": "<p>Before the Flickerfly makes an attack, roll a d6. On a result of 4 or higher, the target’s Evasion is halved against this attack.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -399,14 +400,14 @@
       "name": "Mind Dance",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Mark a Stress</strong> to create a magically dazzling display that grapples the minds of nearby foes. All targets within Close range must make an Instinct Reaction Roll. For each target who failed, you gain a Fear and the Flickerfl y learns one of the target’s fears.</p><p>@Template[type:emanation|range:c]</p>",
+        "description": "<p><strong>Mark a Stress</strong> to create a magically dazzling display that grapples the minds of nearby foes. All targets within Close range must make an Instinct Reaction Roll. For each target who failed, you gain a Fear and the @Lookup[@name] learns one of the target’s fears.</p><p>@Template[type:emanation|range:c]</p>",
         "resource": null,
         "actions": {
           "0wL3ieMrXEb2gcxe": {
             "type": "attack",
             "_id": "0wL3ieMrXEb2gcxe",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to create a magically dazzling display that grapples the minds of nearby foes. All targets within Close range must make an Instinct Reaction Roll. For each target who failed, you gain a Fear and the Flickerfl y learns one of the target’s fears.</p><p>@Template[type:emanation|range:c]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -450,7 +451,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "Bt7MqMkPpPpzWksK",
       "img": "icons/magic/light/explosion-glow-spiral-yellow.webp",
@@ -471,14 +473,14 @@
       "name": "Hallucinatory Breath",
       "type": "feature",
       "system": {
-        "description": "<p>Countdown (Loop 1d6). When the Flickerfly takes damage for the first time, activate the countdown. When it triggers, the Flickerfly breathes hallucinatory gas on all targets in front of them up to Far range. Targets must succeed on an Instinct Reaction Roll or be tormented by fearful hallucinations. Targets whose fears are known to the Flickerfly have disadvantage on this roll. Targets who fail must mark a Stress and lose a Hope.</p><p>@Template[type:inFront|range:f]</p>",
+        "description": "<p>Countdown (Loop 1d6). When the @Lookup[@name] takes damage for the first time, activate the countdown. When it triggers, the @Lookup[@name] breathes hallucinatory gas on all targets in front of them up to Far range. Targets must succeed on an Instinct Reaction Roll or be tormented by fearful hallucinations. Targets whose fears are known to the @Lookup[@name] have disadvantage on this roll. Targets who fail must mark a Stress and lose a Hope.</p><p>@Template[type:inFront|range:f]</p>",
         "resource": null,
         "actions": {
           "USEkCakSzYcZbBwY": {
             "type": "attack",
             "_id": "USEkCakSzYcZbBwY",
             "systemPath": "actions",
-            "description": "<p>The Flickerfly breathes hallucinatory gas on all targets in front of them up to Far range. Targets must succeed on an Instinct Reaction Roll or be tormented by fearful hallucinations. Targets whose fears are known to the Flickerfl y have disadvantage on this roll. Targets who fail must mark a Stress and lose a Hope.</p><p>@Template[type:inFront|range:f]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -575,7 +577,7 @@
             "type": "countdown",
             "_id": "n8ZuLjwTf2FJ7V6n",
             "systemPath": "actions",
-            "description": "<p>Countdown (Loop 1d6). When the Flickerfly takes damage for the first time, activate the countdown.</p>",
+            "description": "<p>Countdown (Loop 1d6). When the @Lookup[@name] takes damage for the first time, activate the countdown.</p>",
             "chatDisplay": true,
             "originItem": {
               "type": "itemCollection"
@@ -610,7 +612,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "EjfM83eVCdcVGC3c",
       "img": "icons/magic/air/fog-gas-smoke-purple.webp",
diff --git a/src/packs/adversaries/adversary_Knight_of_the_Realm_7ai2opemrclQe3VF.json b/src/packs/adversaries/adversary_Knight_of_the_Realm_7ai2opemrclQe3VF.json
index 298af435..71cb7a8d 100644
--- a/src/packs/adversaries/adversary_Knight_of_the_Realm_7ai2opemrclQe3VF.json
+++ b/src/packs/adversaries/adversary_Knight_of_the_Realm_7ai2opemrclQe3VF.json
@@ -127,7 +127,8 @@
       "source": "Daggerheart SRD",
       "page": 88,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "7ai2opemrclQe3VF",
@@ -236,7 +237,7 @@
       "name": "Chevalier",
       "type": "feature",
       "system": {
-        "description": "<p>While the Knight is on a mount, they gain a +2 bonus to their Difficulty. When they take Severe damage, they’re knocked from their mount and lose this benefit until they’re next spotlighted.</p>",
+        "description": "<p>While the @Lookup[@name] is on a mount, they gain a +2 bonus to their Difficulty. When they take Severe damage, they’re knocked from their mount and lose this benefit until they’re next spotlighted.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -305,7 +306,7 @@
       "name": "Heavily Armored",
       "type": "feature",
       "system": {
-        "description": "<p> When the Knight takes physical damage, reduce it by 3.</p>",
+        "description": "<p>When the @Lookup[@name] takes physical damage, reduce it by 3.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -374,14 +375,14 @@
       "name": "Cavalry Charge",
       "type": "feature",
       "system": {
-        "description": "<p>If the Knight is mounted, move up to Far range and make a standard attack against a target. On a success, deal <strong>2d8+4</strong> physical damage and the target must mark a Stress.</p>",
+        "description": "<p>If the @Lookup[@name] is mounted, move up to Far range and make a standard attack against a target. On a success, deal <strong>2d8+4</strong> physical damage and the target must mark a Stress.</p>",
         "resource": null,
         "actions": {
           "Mb079uPkaZgpo9y3": {
             "type": "attack",
             "_id": "Mb079uPkaZgpo9y3",
             "systemPath": "actions",
-            "description": "<p>If the Knight is mounted, move up to Far range and make a standard attack against a target. On a success, deal <strong>2d8+4</strong> physical damage and the target must mark a Stress.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -475,7 +476,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "djKDZawLnGF1zkbY",
       "img": "icons/skills/movement/arrow-upward-yellow.webp",
@@ -503,7 +505,7 @@
             "type": "effect",
             "_id": "V5fLHHdTOita6u9f",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to spotlight <strong>[[/r 1d4+1]]</strong> allies. Attacks they make while spotlighted in this way deal half damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -530,7 +532,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "RoxNNIn0m9rHQDH8",
       "img": "icons/environment/people/charge.webp",
diff --git a/src/packs/adversaries/adversary_Kraken_4nqv3ZwJGjnmic8j.json b/src/packs/adversaries/adversary_Kraken_4nqv3ZwJGjnmic8j.json
index 12f881d4..3b84774e 100644
--- a/src/packs/adversaries/adversary_Kraken_4nqv3ZwJGjnmic8j.json
+++ b/src/packs/adversaries/adversary_Kraken_4nqv3ZwJGjnmic8j.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 99,
       "artist": ""
-    }
+    },
+    "size": "gargantuan"
   },
   "flags": {},
   "_id": "4nqv3ZwJGjnmic8j",
@@ -226,14 +227,14 @@
       "name": "Relentless (3)",
       "type": "feature",
       "system": {
-        "description": "<p>The Kraken can be spotlighted up to three times per GM turn. Spend Fear as usual to spotlight them.</p>",
+        "description": "<p>The @Lookup[@name] can be spotlighted up to three times per GM turn. Spend Fear as usual to spotlight them.</p>",
         "resource": null,
         "actions": {
           "420LQBs27zQTAXfY": {
             "type": "effect",
             "_id": "420LQBs27zQTAXfY",
             "systemPath": "actions",
-            "description": "<p>The Kraken can be spotlighted up to three times per GM turn. Spend Fear as usual to spotlight them.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "passive",
             "cost": [
@@ -284,7 +285,7 @@
       "name": "Many Tentacles",
       "type": "feature",
       "system": {
-        "description": "<p>While the Kraken has 7 or fewer marked HP, they can make their standard attack against two targets within range.</p>",
+        "description": "<p>While the @Lookup[@name] has 7 or fewer marked HP, they can make their standard attack against two targets within range.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -309,7 +310,7 @@
       "name": "Grapple and Drown",
       "type": "feature",
       "system": {
-        "description": "<p>Make an attack roll against a target within Close range. On a success, <strong>mark a Stress</strong> to grab them with a tentacle and drag them beneath the water. The target is <em>Restrained</em> and <em>Vulnerable</em> until they break free with a successful Strength Roll or the Kraken takes Major or greater damage. While <em>Restrained</em> and <em>Vulnerable</em> in this way, a target must mark a Stress when they make an action roll.</p>",
+        "description": "<p>Make an attack roll against a target within Close range. On a success, <strong>mark a Stress</strong> to grab them with a tentacle and drag them beneath the water. The target is <em>Restrained</em> and <em>Vulnerable</em> until they break free with a successful Strength Roll or the @Lookup[@name] takes Major or greater damage. While <em>Restrained</em> and <em>Vulnerable</em> in this way, a target must mark a Stress when they make an action roll.</p>",
         "resource": null,
         "actions": {
           "SX2Y4OapGEawl17j": {
@@ -365,7 +366,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "vz2BWhispgR7mSWF",
       "img": "icons/magic/water/orb-water-bubbles-blue.webp",
@@ -433,7 +435,7 @@
             "type": "attack",
             "_id": "pHZUiZRSj4FuG0uK",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to spew a line of boiling water at any number of targets in a line up to Far range. All targets must succeed on an Agility Reaction Roll or take <strong>4d6+9</strong> physical damage. If a target marks an Armor Slot to reduce the damage, they must also mark a Stress.</p><p>@Template[type:ray|range:f]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -504,7 +506,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "eksa3E2ecBgdib6h",
       "img": "icons/magic/water/projectile-icecicle-glowing.webp",
@@ -525,14 +528,14 @@
       "name": "Momentum",
       "type": "feature",
       "system": {
-        "description": "<p>When the Kraken makes a successful attack against a PC, you gain a Fear.</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack against a PC, you gain a Fear.</p>",
         "resource": null,
         "actions": {
           "hXQtIGmSaWKMOuFB": {
             "type": "healing",
             "_id": "hXQtIGmSaWKMOuFB",
             "systemPath": "actions",
-            "description": "<p>When the Kraken makes a successful attack against a PC, you gain a Fear.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "reaction",
             "cost": [],
@@ -599,7 +602,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "m4aybzb8tXWHelDU",
       "img": "icons/skills/melee/strike-weapons-orange.webp",
diff --git a/src/packs/adversaries/adversary_Masked_Thief_niBpVU7yeo5ccskE.json b/src/packs/adversaries/adversary_Masked_Thief_niBpVU7yeo5ccskE.json
index 90ede3ec..528df6a9 100644
--- a/src/packs/adversaries/adversary_Masked_Thief_niBpVU7yeo5ccskE.json
+++ b/src/packs/adversaries/adversary_Masked_Thief_niBpVU7yeo5ccskE.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 88,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "niBpVU7yeo5ccskE",
@@ -226,14 +227,14 @@
       "name": "Quick Hands",
       "type": "feature",
       "system": {
-        "description": "<p>Make an attack against a target within Melee range. On a success, deal <strong>1d8+2</strong> physical damage and the Thief steals one item or consumable from the target’s inventory.</p>",
+        "description": "<p>Make an attack against a target within Melee range. On a success, deal <strong>1d8+2</strong> physical damage and the @Lookup[@name] steals one item or consumable from the target’s inventory.</p>",
         "resource": null,
         "actions": {
           "33xlM2ph77SSUfBs": {
             "type": "attack",
             "_id": "33xlM2ph77SSUfBs",
             "systemPath": "actions",
-            "description": "<p>Make an attack against a target within Melee range. On a success, deal <strong>1d8+2</strong> physical damage and the Thief steals one item or consumable from the target’s inventory.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -302,7 +303,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "Cgk36WXthA9LwOYb",
       "img": "icons/skills/melee/strike-sword-gray.webp",
@@ -323,14 +325,14 @@
       "name": "Escape Plan",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Mark a Stress</strong> to reveal a snare trap set anywhere on the battlefi eld by the Thief. All targets within Very Close range of the trap must succeed on an Agility Reaction Roll (13) or be pulled off  their feet and suspended upside down. A target is Restrained and Vulnerable until they break free, ending both conditions, with a successful Finesse or Strength Roll (13).</p><p>@Template[type:rect|range:c]</p>",
+        "description": "<p><strong>Mark a Stress</strong> to reveal a snare trap set anywhere on the battlefield by the @Lookup[@name]. All targets within Very Close range of the trap must succeed on an Agility Reaction Roll (13) or be pulled off their feet and suspended upside down. A target is Restrained and Vulnerable until they break free, ending both conditions, with a successful Finesse or Strength Roll (13).</p><p>@Template[type:rect|range:c]</p>",
         "resource": null,
         "actions": {
           "sq0q1l2Go4GduR3B": {
             "type": "attack",
             "_id": "sq0q1l2Go4GduR3B",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to reveal a snare trap set anywhere on the battlefi eld by the Thief. All targets within Very Close range of the trap must succeed on an Agility Reaction Roll (13) or be pulled off their feet and suspended upside down. A target is Restrained and Vulnerable until they break free, ending both conditions, with a successful Finesse or Strength Roll (13).</p><p>@Template[type:rect|range:c]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -379,7 +381,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "tP2DD751nOLxFVps",
       "img": "icons/environment/traps/trap-jaw-tan.webp",
diff --git a/src/packs/adversaries/adversary_Master_Assassin_dNta0cUzr96xcFhf.json b/src/packs/adversaries/adversary_Master_Assassin_dNta0cUzr96xcFhf.json
index 557ef607..3cec6e0b 100644
--- a/src/packs/adversaries/adversary_Master_Assassin_dNta0cUzr96xcFhf.json
+++ b/src/packs/adversaries/adversary_Master_Assassin_dNta0cUzr96xcFhf.json
@@ -122,7 +122,8 @@
       "source": "Daggerheart SRD",
       "page": 84,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "dNta0cUzr96xcFhf",
@@ -231,7 +232,7 @@
       "name": "Won't See it Coming",
       "type": "feature",
       "system": {
-        "description": "<p> The Assassin deals direct damage while they’re <em>Hidden</em>.</p>",
+        "description": "<p>The @Lookup[@name] deals direct damage while they’re <em>Hidden</em>.</p>",
         "resource": null,
         "actions": {
           "xFBE0jLf96fbCY7K": {
@@ -239,7 +240,7 @@
             "_id": "xFBE0jLf96fbCY7K",
             "systemPath": "actions",
             "baseAction": false,
-            "description": "<p>The Assassin deals direct damage while they’re <em>Hidden</em>.</p>",
+            "description": "",
             "chatDisplay": true,
             "originItem": {
               "type": "itemCollection"
@@ -338,14 +339,14 @@
       "name": "Strike as One",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Mark a Stress</strong> to spotlight a number of other Assassins equal to the Assassin’s unmarked Stress.</p>",
+        "description": "<p><strong>Mark a Stress</strong> to spotlight a number of other Assassins equal to the @Lookup[@name]’s unmarked Stress.</p>",
         "resource": null,
         "actions": {
           "vKRDbD07bqR317Zv": {
             "type": "effect",
             "_id": "vKRDbD07bqR317Zv",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to spotlight a number of other Assassins equal to the Assassin’s unmarked Stress.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -372,7 +373,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "za6Qr0CjI9Kb4I0U",
       "img": "icons/skills/movement/arrows-up-trio-red.webp",
@@ -393,14 +395,14 @@
       "name": "The Subtle Blade",
       "type": "feature",
       "system": {
-        "description": "<p>When the Assassin successfully makes a standard attack against a <em>Vulnerable</em> target, you can <strong>spend a Fear</strong> to deal Severe damage instead of their standard damage.</p>",
+        "description": "<p>When the @Lookup[@name] successfully makes a standard attack against a <em>Vulnerable</em> target, you can <strong>spend a Fear</strong> to deal Severe damage instead of their standard damage.</p>",
         "resource": null,
         "actions": {
           "tYkZ9BwjlOg61BhE": {
             "type": "effect",
             "_id": "tYkZ9BwjlOg61BhE",
             "systemPath": "actions",
-            "description": "<p>When the Assassin successfully makes a standard attack against a <em>Vulnerable</em> target, you can <strong>spend a Fear</strong> to deal Severe damage instead of their standard damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -427,7 +429,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "s0WcpK43WN2ptqNc",
       "img": "icons/skills/melee/strike-dagger-blood-red.webp",
@@ -448,14 +451,14 @@
       "name": "Momentum",
       "type": "feature",
       "system": {
-        "description": "<p> When the Assassin makes a successful attack against a PC, you gain a Fear.</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack against a PC, you gain a Fear.</p>",
         "resource": null,
         "actions": {
           "7EP5X5kodzMCBQZO": {
             "type": "healing",
             "_id": "7EP5X5kodzMCBQZO",
             "systemPath": "actions",
-            "description": "<p>When the Assassin makes a successful attack against a PC, you gain a Fear.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "reaction",
             "cost": [],
@@ -522,7 +525,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "PcNgHScmTd9l3exN",
       "img": "icons/skills/melee/strike-weapons-orange.webp",
diff --git a/src/packs/adversaries/adversary_Merchant_Al3w2CgjfdT3p9ma.json b/src/packs/adversaries/adversary_Merchant_Al3w2CgjfdT3p9ma.json
index 43135e6f..880b1a6e 100644
--- a/src/packs/adversaries/adversary_Merchant_Al3w2CgjfdT3p9ma.json
+++ b/src/packs/adversaries/adversary_Merchant_Al3w2CgjfdT3p9ma.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 79,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "Al3w2CgjfdT3p9ma",
@@ -228,7 +229,7 @@
       "_id": "3Fwj28UxUcdMifoi",
       "img": "icons/skills/social/diplomacy-handshake.webp",
       "system": {
-        "description": "<p>A PC who succeeds on a Presence Roll against the Merchant gains a discount on purchases. A PC who fails on a Presence Roll against the Merchant must pay more and has disadvantage on future Presence Rolls against the Merchant.</p>",
+        "description": "<p>A PC who succeeds on a Presence Roll against the @Lookup[@name] gains a discount on purchases. A PC who fails on a Presence Roll against the @Lookup[@name] must pay more and has disadvantage on future Presence Rolls against the @Lookup[@name].</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -254,14 +255,14 @@
       "_id": "Ksdgov6mYg7Og2ys",
       "img": "icons/skills/social/trading-justice-scale-yellow.webp",
       "system": {
-        "description": "<p>When a PC rolls a 14 or lower on a Presence Roll made against the Merchant, they must mark a Stress.</p>",
+        "description": "<p>When a PC rolls a 14 or lower on a Presence Roll made against the @Lookup[@name], they must mark a Stress.</p>",
         "resource": null,
         "actions": {
           "sTHDvAggf1nUX4Ai": {
             "type": "damage",
             "_id": "sTHDvAggf1nUX4Ai",
             "systemPath": "actions",
-            "description": "<p>When a PC rolls a 14 or lower on a Presence Roll made against the Merchant, they must mark a Stress.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
diff --git a/src/packs/adversaries/adversary_Merchant_Baron_Vy02IhGhkJLuezu4.json b/src/packs/adversaries/adversary_Merchant_Baron_Vy02IhGhkJLuezu4.json
index a3ab2363..15c0aeb9 100644
--- a/src/packs/adversaries/adversary_Merchant_Baron_Vy02IhGhkJLuezu4.json
+++ b/src/packs/adversaries/adversary_Merchant_Baron_Vy02IhGhkJLuezu4.json
@@ -122,7 +122,8 @@
       "source": "Daggerheart SRD",
       "page": 88,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "Vy02IhGhkJLuezu4",
@@ -238,7 +239,7 @@
             "type": "attack",
             "_id": "T7N9rDCaB5VOm6AY",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to offer a target a dangerous bargain for something they want or need. If used on a PC, they must make a Presence Reaction Roll (17). On a failure, they must mark 2 Stress or take the deal.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -308,7 +309,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "7dxToUpxOyISXXde",
       "img": "icons/commodities/currency/coins-plain-stack-gold-yellow.webp",
@@ -329,14 +331,14 @@
       "name": "The Best Muscle Money Can Buy",
       "type": "feature",
       "system": {
-        "description": "<p>Once per scene, <strong>mark a Stress</strong> to summon 1d4+1 Tier 1 adversaries, who appear at Far range, to enforce the Baron’s will.</p>",
+        "description": "<p>Once per scene, <strong>mark a Stress</strong> to summon 1d4+1 Tier 1 adversaries, who appear at Far range, to enforce the @Lookup[@name]’s will.</p>",
         "resource": null,
         "actions": {
           "9NA6vgfsv0y2tX9v": {
             "type": "effect",
             "_id": "9NA6vgfsv0y2tX9v",
             "systemPath": "actions",
-            "description": "<p>Once per scene, <strong>mark a Stress</strong> to summon 1d4+1 Tier 1 adversaries, who appear at Far range, to enforce the Baron’s will.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -363,7 +365,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "QnDvERcyaq3XLCjF",
       "img": "icons/environment/people/charge.webp",
diff --git a/src/packs/adversaries/adversary_Minor_Chaos_Elemental_sRn4bqerfARvhgSV.json b/src/packs/adversaries/adversary_Minor_Chaos_Elemental_sRn4bqerfARvhgSV.json
index edb50cf1..b1732c71 100644
--- a/src/packs/adversaries/adversary_Minor_Chaos_Elemental_sRn4bqerfARvhgSV.json
+++ b/src/packs/adversaries/adversary_Minor_Chaos_Elemental_sRn4bqerfARvhgSV.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 79,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "sRn4bqerfARvhgSV",
@@ -222,7 +223,7 @@
       "_id": "4Rw5KC5klRseiLvn",
       "img": "icons/magic/defensive/shield-barrier-flaming-diamond-blue.webp",
       "system": {
-        "description": "<p>The Elemental is resistant to magic damage.</p>",
+        "description": "<p>The @Lookup[@name] is resistant to magic damage.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -299,7 +300,7 @@
             "type": "damage",
             "_id": "g4CVwjDeJgTJ2oCw",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a HP</strong> to force all targets within Close range to mark a Stress and become <em>Vulnerable</em> until their next rest or they clear a HP.</p><p>@Template[type:emanation|range:c]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -362,7 +363,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [
         {
@@ -429,7 +431,7 @@
             "type": "damage",
             "_id": "QzuQIAtSrgz9Zd5V",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to transform the area within Very Close range into a different biome. All targets within this area take <strong>2d6+3</strong> direct magic damage.</p><p>@Template[type:emanation|range:vc]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -488,7 +490,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
@@ -509,12 +512,13 @@
       "_id": "dnVB2DxbpYtwt0S0",
       "img": "icons/magic/light/beam-impact-deflect-teal.webp",
       "system": {
-        "description": "<p>When the Elemental takes damage from an attack within Close range, deal an amount of damage to the attacker equal to half the damage they dealt.</p>",
+        "description": "<p>When the @Lookup[@name] takes damage from an attack within Close range, deal an amount of damage to the attacker equal to half the damage they dealt.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "effects": [],
       "folder": null,
@@ -535,14 +539,14 @@
       "_id": "JqRfb0IZ3aJrVazI",
       "img": "icons/skills/melee/strike-weapons-orange.webp",
       "system": {
-        "description": "<p>When the Elemental makes a successful attack against a PC, you gain a Fear.</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack against a PC, you gain a Fear.</p>",
         "resource": null,
         "actions": {
           "zpQIB9z9kK2BlfqZ": {
             "type": "healing",
             "_id": "zpQIB9z9kK2BlfqZ",
             "systemPath": "actions",
-            "description": "<p>When the Elemental makes a successful attack against a PC, you gain a Fear.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -610,7 +614,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "effects": [],
       "folder": null,
diff --git a/src/packs/adversaries/adversary_Minor_Demon_3tqCjDwJAQ7JKqMb.json b/src/packs/adversaries/adversary_Minor_Demon_3tqCjDwJAQ7JKqMb.json
index 5d6c34cd..3a330fdf 100644
--- a/src/packs/adversaries/adversary_Minor_Demon_3tqCjDwJAQ7JKqMb.json
+++ b/src/packs/adversaries/adversary_Minor_Demon_3tqCjDwJAQ7JKqMb.json
@@ -110,7 +110,8 @@
       "source": "Daggerheart SRD",
       "page": 79,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "3tqCjDwJAQ7JKqMb",
@@ -221,14 +222,14 @@
       "_id": "4xoydX3YwsLujuaI",
       "img": "icons/magic/unholy/silhouette-evil-horned-giant.webp",
       "system": {
-        "description": "<p>The Demon can be spotlighted up to two times per GM turn. Spend Fear as usual to spotlight them.</p>",
+        "description": "<p>The @Lookup[@name] can be spotlighted up to two times per GM turn. Spend Fear as usual to spotlight them.</p>",
         "resource": null,
         "actions": {
           "lfYFbb71wWaR8DJs": {
             "type": "effect",
             "_id": "lfYFbb71wWaR8DJs",
             "systemPath": "actions",
-            "description": "<p>The Demon can be spotlighted up to two times per GM turn. Spend Fear as usual to spotlight them.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "passive",
             "cost": [
@@ -280,14 +281,14 @@
       "_id": "kD9kO92V7t3IqZu8",
       "img": "icons/magic/unholy/strike-hand-glow-pink.webp",
       "system": {
-        "description": "<p>When a PC rolls a failure with Fear while within Close range of the Demon, they lose a Hope.</p><p>@Template[type:emanation|range:c]</p>",
+        "description": "<p>When a PC rolls a failure with Fear while within Close range of the @Lookup[@name], they lose a Hope.</p><p>@Template[type:emanation|range:c]</p>",
         "resource": null,
         "actions": {
           "XQ7QebA0iGvMti4A": {
             "type": "damage",
             "_id": "XQ7QebA0iGvMti4A",
             "systemPath": "actions",
-            "description": "<p>When a PC rolls a failure with Fear while within Close range of the Demon, they lose a Hope.</p><p>@Template[type:emanation|range:c]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -366,7 +367,7 @@
             "type": "attack",
             "_id": "nOzLQ0NJzeB3vKiV",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to rain down hellfire within Far range. All targets within the area must make an Agility Reaction Roll. Targets who fail take <strong>1d20+3</strong> magic damage. Targets who succeed take half damage.</p><p>@Template[type:emanation|range:f]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -445,7 +446,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
@@ -466,14 +468,14 @@
       "_id": "bpLBGTW1DmXPgIcx",
       "img": "icons/magic/death/skull-energy-light-white.webp",
       "system": {
-        "description": "<p>Before rolling damage for the Demon’s attack, you can <strong>mark a Stress</strong> to gain a bonus to the damage roll equal to the Demon’s current number of marked HP.</p>",
+        "description": "<p>Before rolling damage for the @Lookup[@name]’s attack, you can <strong>mark a Stress</strong> to gain a bonus to the damage roll equal to the @Lookup[@name]’s current number of marked HP.</p>",
         "resource": null,
         "actions": {
           "vZq3iaJrMzLYbqQN": {
             "type": "effect",
             "_id": "vZq3iaJrMzLYbqQN",
             "systemPath": "actions",
-            "description": "<p>Before rolling damage for the Demon’s attack, you can <strong>mark a Stress</strong> to gain a bonus to the damage roll equal to the Demon’s current number of marked HP.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -501,7 +503,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "effects": [],
       "folder": null,
@@ -522,14 +525,14 @@
       "_id": "w400aHTlADxDihpt",
       "img": "icons/skills/melee/strike-weapons-orange.webp",
       "system": {
-        "description": "<p>When the Demon makes a successful attack against a PC, you gain a Fear.</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack against a PC, you gain a Fear.</p>",
         "resource": null,
         "actions": {
           "Cmd4f2gfxgOZsN6f": {
             "type": "healing",
             "_id": "Cmd4f2gfxgOZsN6f",
             "systemPath": "actions",
-            "description": "<p>When the Demon makes a successful attack against a PC, you gain a Fear.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -597,7 +600,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "effects": [],
       "folder": null,
diff --git a/src/packs/adversaries/adversary_Minor_Fire_Elemental_DscWkNVoHak6P4hh.json b/src/packs/adversaries/adversary_Minor_Fire_Elemental_DscWkNVoHak6P4hh.json
index 7421e270..2980a141 100644
--- a/src/packs/adversaries/adversary_Minor_Fire_Elemental_DscWkNVoHak6P4hh.json
+++ b/src/packs/adversaries/adversary_Minor_Fire_Elemental_DscWkNVoHak6P4hh.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 79,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "_id": "DscWkNVoHak6P4hh",
@@ -222,14 +223,14 @@
       "_id": "c1jcZZD616J5Y4Mb",
       "img": "icons/magic/unholy/silhouette-evil-horned-giant.webp",
       "system": {
-        "description": "<p>The Elemental can be spotlighted up to two times per GM turn. Spend Fear as usual to spotlight them.</p>",
+        "description": "<p>The @Lookup[@name] can be spotlighted up to two times per GM turn. Spend Fear as usual to spotlight them.</p>",
         "resource": null,
         "actions": {
           "oFsBEbdXCpX9XLQy": {
             "type": "effect",
             "_id": "oFsBEbdXCpX9XLQy",
             "systemPath": "actions",
-            "description": "<p>The Elemental can be spotlighted up to two times per GM turn. Spend Fear as usual to spotlight them.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "passive",
             "cost": [],
@@ -272,14 +273,14 @@
       "_id": "7AXE86WNd68OySkD",
       "img": "icons/magic/fire/explosion-flame-lightning-strike.webp",
       "system": {
-        "description": "<p><strong>Mark a Stress</strong> to choose a point within Far range. The ground within Very Close range of that point immediately bursts into fl ames. All creatures within this area must make an Agility Reaction Roll. Targets who fail take <strong>2d8</strong> magic damage from the fl ames. Targets who succeed take half damage.</p><p>@Template[type:circle|range:vc]</p>",
+        "description": "<p><strong>Mark a Stress</strong> to choose a point within Far range. The ground within Very Close range of that point immediately bursts into flames. All creatures within this area must make an Agility Reaction Roll. Targets who fail take <strong>2d8</strong> magic damage from the flames. Targets who succeed take half damage.</p><p>@Template[type:circle|range:vc]</p>",
         "resource": null,
         "actions": {
           "x1VCkfcSYiPyg8fk": {
             "type": "attack",
             "_id": "x1VCkfcSYiPyg8fk",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to choose a point within Far range. The ground within Very Close range of that point immediately bursts into fl ames. All creatures within this area must make an Agility Reaction Roll. Targets who fail take <strong>2d8</strong> magic damage from the fl ames. Targets who succeed take half damage.</p><p>@Template[type:circle|range:vc]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -358,7 +359,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
@@ -465,7 +467,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
@@ -486,7 +489,7 @@
       "_id": "3u6wvKPJAS2v5nWV",
       "img": "icons/magic/fire/elemental-fire-flying.webp",
       "system": {
-        "description": "<p>Three times per scene, when the Elemental moves onto objects that are highly flammable, consume them to clear a HP or a Stress.</p>",
+        "description": "<p>Three times per scene, when the @Lookup[@name] moves onto objects that are highly flammable, consume them to clear a HP or a Stress.</p>",
         "resource": {
           "type": "simple",
           "value": 0,
@@ -498,7 +501,7 @@
             "type": "healing",
             "_id": "CTWSVVisdgJgF7pd",
             "systemPath": "actions",
-            "description": "<p>Three times per scene, when the Elemental moves onto objects that are highly flammable, consume them to clear a HP or a Stress.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -565,7 +568,7 @@
             "type": "healing",
             "_id": "e0fG0xtj6hOUp66o",
             "systemPath": "actions",
-            "description": "<p>Three times per scene, when the Elemental moves onto objects that are highly flammable, consume them to clear a HP or a Stress.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -631,7 +634,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "effects": [],
       "folder": null,
@@ -652,14 +656,14 @@
       "_id": "kssnXljBaV31iX58",
       "img": "icons/skills/melee/strike-weapons-orange.webp",
       "system": {
-        "description": "<p> When the Elemental makes a successful attack against a PC, you gain a Fear.</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack against a PC, you gain a Fear.</p>",
         "resource": null,
         "actions": {
           "rPj1Wf22Kai3eBCv": {
             "type": "healing",
             "_id": "rPj1Wf22Kai3eBCv",
             "systemPath": "actions",
-            "description": "<p>When the Elemental makes a successful attack against a PC, you gain a Fear.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "reaction",
             "cost": [],
@@ -727,7 +731,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "effects": [],
       "folder": null,
diff --git a/src/packs/adversaries/adversary_Minor_Treant_G62k4oSkhkoXEs2D.json b/src/packs/adversaries/adversary_Minor_Treant_G62k4oSkhkoXEs2D.json
index 267a1e14..0f1e7ded 100644
--- a/src/packs/adversaries/adversary_Minor_Treant_G62k4oSkhkoXEs2D.json
+++ b/src/packs/adversaries/adversary_Minor_Treant_G62k4oSkhkoXEs2D.json
@@ -104,7 +104,8 @@
       "source": "Daggerheart SRD",
       "page": 80,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "G62k4oSkhkoXEs2D",
@@ -215,7 +216,7 @@
       "_id": "gOgqATDRzPP7Jzbh",
       "img": "icons/magic/symbols/runes-carved-stone-yellow.webp",
       "system": {
-        "description": "<p>The Treant is defeated when they take any damage. For every 5 damage a PC deals to the Treant, defeat an additional Minion within range the attack would succeed against.</p>",
+        "description": "<p>The @Lookup[@name] is defeated when they take any damage. For every 5 damage a PC deals to the @Lookup[@name], defeat an additional Minion within range the attack would succeed against.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -241,14 +242,14 @@
       "_id": "K08WlZwGqzEo4idT",
       "img": "icons/creatures/abilities/tail-strike-bone-orange.webp",
       "system": {
-        "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all Minor Treants within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 4 physical damage each. Combine this damage.</p>",
+        "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all @Lookup[@name]s within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 4 physical damage each. Combine this damage.</p>",
         "resource": null,
         "actions": {
           "xTMNAHcoErKuR6TZ": {
             "type": "effect",
             "_id": "xTMNAHcoErKuR6TZ",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all Minor Treants within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 4 physical damage each. Combine this damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -276,7 +277,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
diff --git a/src/packs/adversaries/adversary_Minotaur_Wrecker_rM9qCIYeWg9I0B4l.json b/src/packs/adversaries/adversary_Minotaur_Wrecker_rM9qCIYeWg9I0B4l.json
index 570db804..85981374 100644
--- a/src/packs/adversaries/adversary_Minotaur_Wrecker_rM9qCIYeWg9I0B4l.json
+++ b/src/packs/adversaries/adversary_Minotaur_Wrecker_rM9qCIYeWg9I0B4l.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 89,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "_id": "rM9qCIYeWg9I0B4l",
@@ -220,14 +221,14 @@
       "name": "Ramp Up",
       "type": "feature",
       "system": {
-        "description": "<p>You must <strong>spend a Fear</strong> to spotlight the Minotaur. While spotlighted, they can make their standard attack against all targets within range.</p>",
+        "description": "<p>You must <strong>spend a Fear</strong> to spotlight the @Lookup[@name]. While spotlighted, they can make their standard attack against all targets within range.</p>",
         "resource": null,
         "actions": {
           "oVGqHl82zSjnlym3": {
             "type": "effect",
             "_id": "oVGqHl82zSjnlym3",
             "systemPath": "actions",
-            "description": "<p>You must <strong>spend a Fear</strong> to spotlight the Minotaur. While spotlighted, they can make their standard attack against all targets within range.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -275,14 +276,14 @@
       "name": "Charging Bull",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Mark a Stress</strong> to charge through a group within Close range and make an attack against all targets in the Minotaur’s path. Targets the Minotaur succeeds against take <strong>2d6+8</strong> physical damage and are knocked back to Very Far range. If a target is knocked into a solid object or another creature, they take an extra <strong>1d6</strong> damage (combine the damage).</p>",
+        "description": "<p><strong>Mark a Stress</strong> to charge through a group within Close range and make an attack against all targets in the @Lookup[@name]’s path. Targets the @Lookup[@name] succeeds against take <strong>2d6+8</strong> physical damage and are knocked back to Very Far range. If a target is knocked into a solid object or another creature, they take an extra <strong>1d6</strong> damage (combine the damage).</p>",
         "resource": null,
         "actions": {
           "8fgkb7U2pxNyiHrB": {
             "type": "attack",
             "_id": "8fgkb7U2pxNyiHrB",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to charge through a group within Close range and make an attack against all targets in the Minotaur’s path. Targets the Minotaur succeeds against take <strong>2d6+8</strong> physical damage and are knocked back to Very Far range. If a target is knocked into a solid object or another creature, they take an extra <strong>1d6</strong> damage (combine the damage).</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -414,7 +415,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "b2QvDYOq1nreI2uD",
       "img": "icons/creatures/mammals/bull-horned-blue.webp",
@@ -512,7 +514,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "WxbHcbaeb6L7g8qN",
       "img": "icons/skills/melee/strike-slashes-red.webp",
diff --git a/src/packs/adversaries/adversary_Monarch_yx0vK2yfNVZKWUUi.json b/src/packs/adversaries/adversary_Monarch_yx0vK2yfNVZKWUUi.json
index 3f2d7d88..5320a0ed 100644
--- a/src/packs/adversaries/adversary_Monarch_yx0vK2yfNVZKWUUi.json
+++ b/src/packs/adversaries/adversary_Monarch_yx0vK2yfNVZKWUUi.json
@@ -122,7 +122,8 @@
       "source": "Daggerheart SRD",
       "page": 94,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "yx0vK2yfNVZKWUUi",
@@ -235,7 +236,8 @@
         "resource": null,
         "actions": {},
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "iYHCYTJzZbw5f0pF",
       "img": "icons/commodities/treasure/crown-gold-satin-gems-red.webp",
@@ -256,14 +258,14 @@
       "name": "Crownsguard",
       "type": "feature",
       "system": {
-        "description": "<p>Once per scene, <strong>mark a Stress</strong> to summon six Tier 3 Minions, who appear at Close range to enforce the Monarch’s will.</p>",
+        "description": "<p>Once per scene, <strong>mark a Stress</strong> to summon six Tier 3 Minions, who appear at Close range to enforce the @Lookup[@name]’s will.</p>",
         "resource": null,
         "actions": {
           "OJyqqCi0npye34y2": {
             "type": "effect",
             "_id": "OJyqqCi0npye34y2",
             "systemPath": "actions",
-            "description": "<p>Once per scene, <strong>mark a Stress</strong> to summon six Tier 3 Minions, who appear at Close range to enforce the Monarch’s will.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -290,7 +292,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "9K7C1PR4Q6QrUjjb",
       "img": "icons/environment/people/charge.webp",
@@ -311,14 +314,14 @@
       "name": "Casus Belli",
       "type": "feature",
       "system": {
-        "description": "<p><em>Long-Term Countdown (8)</em>. <strong>Spend a Fear</strong> to activate after the Monarch’s desire for war is first revealed. When it triggers, the Monarch has a reason to rally the nation to war and the support to act on that reason. You gain [[/r 1d4]]<strong> </strong>Fear.</p>",
+        "description": "<p><em>Long-Term Countdown (8)</em>. <strong>Spend a Fear</strong> to activate after the @Lookup[@name]’s desire for war is first revealed. When it triggers, the @Lookup[@name] has a reason to rally the nation to war and the support to act on that reason. You gain [[/r 1d4]]<strong> </strong>Fear.</p>",
         "resource": null,
         "actions": {
           "CNEOOdPI4xVJ2JeP": {
             "type": "countdown",
             "_id": "CNEOOdPI4xVJ2JeP",
             "systemPath": "actions",
-            "description": "<p><em>Long-Term Countdown (8)</em>. <strong>Spend a Fear</strong> to activate after the Monarch’s desire for war is first revealed.</p>",
+            "description": "<p><em>Long-Term Countdown (8)</em>. <strong>Spend a Fear</strong> to activate after the @Lookup[@name]’s desire for war is first revealed.</p>",
             "chatDisplay": true,
             "originItem": {
               "type": "itemCollection"
@@ -364,7 +367,7 @@
             "type": "healing",
             "_id": "QnZoH9LjJvKl5YcF",
             "systemPath": "actions",
-            "description": "<p><span style=\"color: rgb(239, 230, 216); font-family: Montserrat, 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: rgba(24, 22, 46, 0.565); text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial; display: inline !important; float: none\">The Monarch has a reason to rally the nation to war and the support to act on that reason. You gain </span><span class=\"inline-roll roll\" data-mode=\"roll\" data-flavor=\"\" data-formula=\"1d4\" data-tooltip-text=\"1d4\" style=\"box-sizing: border-box; cursor: pointer; background: none 0% 0% / auto repeat scroll padding-box border-box rgba(11, 10, 19, 0.9); border-color: rgb(129, 107, 102); border-style: solid; border-width: 0.8px; border-image: none 100% / 1 / 0 stretch; border-radius: 2px; color: rgb(239, 230, 216); margin: -1px 0px; padding: 1px 4px 0px; white-space: nowrap; word-break: break-all; scrollbar-width: thin; scrollbar-color: rgb(93, 20, 43) rgba(0, 0, 0, 0); font-family: Montserrat, 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; text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial\">1d4</span><span style=\"box-sizing: border-box; scrollbar-width: thin; scrollbar-color: rgb(93, 20, 43) rgba(0, 0, 0, 0); color: rgb(239, 230, 216); font-family: Montserrat, sans-serif; font-size: 14px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; 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: rgba(24, 22, 46, 0.565); text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial\"> </span><span style=\"color: rgb(239, 230, 216); font-family: Montserrat, 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: rgba(24, 22, 46, 0.565); text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial; display: inline !important; float: none\">Fear.</span></p>",
+            "description": "<p>The @Lookup[@name] has a <span style=\"color: rgb(239, 230, 216); font-family: Montserrat, 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: rgba(24, 22, 46, 0.565); text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial; display: inline !important; float: none\">reason to rally the nation to war and the support to act on that reason. You gain </span><span class=\"inline-roll roll\" data-mode=\"roll\" data-flavor=\"\" data-formula=\"1d4\" data-tooltip-text=\"1d4\" style=\"box-sizing: border-box; cursor: pointer; background: none 0% 0% / auto repeat scroll padding-box border-box rgba(11, 10, 19, 0.9); border-color: rgb(129, 107, 102); border-style: solid; border-width: 0.8px; border-image: none 100% / 1 / 0 stretch; border-radius: 2px; color: rgb(239, 230, 216); margin: -1px 0px; padding: 1px 4px 0px; white-space: nowrap; word-break: break-all; scrollbar-width: thin; scrollbar-color: rgb(93, 20, 43) rgba(0, 0, 0, 0); font-family: Montserrat, 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; text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial\">1d4</span><span style=\"box-sizing: border-box; scrollbar-width: thin; scrollbar-color: rgb(93, 20, 43) rgba(0, 0, 0, 0); color: rgb(239, 230, 216); font-family: Montserrat, sans-serif; font-size: 14px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; 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: rgba(24, 22, 46, 0.565); text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial\"> </span><span style=\"color: rgb(239, 230, 216); font-family: Montserrat, 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: rgba(24, 22, 46, 0.565); text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial; display: inline !important; float: none\">Fear.</span></p>",
             "chatDisplay": true,
             "originItem": {
               "type": "itemCollection"
@@ -435,7 +438,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "kA5NZTdiknsh7wxp",
       "img": "icons/sundries/scrolls/scroll-bound-sealed-red-tan.webp",
diff --git a/src/packs/adversaries/adversary_Mortal_Hunter_mVV7a7KQAORoPMgZ.json b/src/packs/adversaries/adversary_Mortal_Hunter_mVV7a7KQAORoPMgZ.json
index 721d8973..8bc7fe10 100644
--- a/src/packs/adversaries/adversary_Mortal_Hunter_mVV7a7KQAORoPMgZ.json
+++ b/src/packs/adversaries/adversary_Mortal_Hunter_mVV7a7KQAORoPMgZ.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 89,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "mVV7a7KQAORoPMgZ",
@@ -226,14 +227,14 @@
       "name": "Terrifying",
       "type": "feature",
       "system": {
-        "description": "<p>When the Hunter makes a successful attack, all PCs within Far range lose a Hope and you gain a Fear.</p><p>@Template[type:emanation|range:f]</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack, all PCs within Far range lose a Hope and you gain a Fear.</p><p>@Template[type:emanation|range:f]</p>",
         "resource": null,
         "actions": {
           "9T1g3FH38cnCRG8k": {
             "type": "damage",
             "_id": "9T1g3FH38cnCRG8k",
             "systemPath": "actions",
-            "description": "<p>When the Hunter makes a successful attack, all PCs within Far range lose a Hope and you gain a Fear.</p><p>@Template[type:emanation|range:f]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -304,14 +305,14 @@
       "name": "Deathlock",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Spend a Fear</strong> to curse a target within Very Close range with a necrotic Deathlock until the end of the scene. Attacks made by the Hunter against a Deathlocked target deal direct damage. The Hunter can only maintain one Deathlock at a time.</p>",
+        "description": "<p><strong>Spend a Fear</strong> to curse a target within Very Close range with a necrotic Deathlock until the end of the scene. Attacks made by the @Lookup[@name] against a Deathlocked target deal direct damage. The @Lookup[@name] can only maintain one Deathlock at a time.</p>",
         "resource": null,
         "actions": {
           "LUNsI29woLk4m2wo": {
             "type": "effect",
             "_id": "LUNsI29woLk4m2wo",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to curse a target within Very Close range with a necrotic Deathlock until the end of the scene. Attacks made by the Hunter against a Deathlocked target deal direct damage. The Hunter can only maintain one Deathlock at a time.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -346,7 +347,7 @@
             "_id": "zLKfwa8a2YBRLKAF",
             "systemPath": "actions",
             "baseAction": false,
-            "description": "<p> Attacks made by the Hunter against a Deathlocked target deal direct damage.</p>",
+            "description": "<p>Attacks made by the @Lookup[@name] against a Deathlocked target deal direct damage.</p>",
             "chatDisplay": true,
             "originItem": {
               "type": "itemCollection"
@@ -424,7 +425,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "r1T70u9n3bRfUTX5",
       "img": "icons/magic/unholy/hand-marked-pink.webp",
@@ -489,7 +491,7 @@
             "type": "attack",
             "_id": "wxOfNoEogH1EU0Jb",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to spotlight <strong>1d4</strong> allies. Attacks they make while spotlighted in this way deal half damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -540,7 +542,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "5AQTqW1GDidHfU3a",
       "img": "icons/skills/movement/arrows-up-trio-red.webp",
@@ -561,14 +564,14 @@
       "name": "Rampage",
       "type": "feature",
       "system": {
-        "description": "<p><em>Countdown (Loop 1d6)</em>. When the Hunter is in the spotlight for the first time, activate the countdown. When it triggers, move the Hunter in a straight line to a point within Far range and make an attack against all targets in their path. Targets the Hunter succeeds against take <strong>2d8+2</strong> physical damage.</p><p>@Template[type:ray|range:f]</p>",
+        "description": "<p><em>Countdown (Loop 1d6)</em>. When the @Lookup[@name] is in the spotlight for the first time, activate the countdown. When it triggers, move the @Lookup[@name] in a straight line to a point within Far range and make an attack against all targets in their path. Targets the @Lookup[@name] succeeds against take <strong>2d8+2</strong> physical damage.</p><p>@Template[type:ray|range:f]</p>",
         "resource": null,
         "actions": {
           "VjiFxuzfAaq5N1jy": {
             "type": "attack",
             "_id": "VjiFxuzfAaq5N1jy",
             "systemPath": "actions",
-            "description": "<p>Move the Hunter in a straight line to a point within Far range and make an attack against all targets in their path. Targets the Hunter succeeds against take <strong>2d8+2</strong> physical damage.</p><p>@Template[type:ray|range:f]</p>",
+            "description": "<p>Move the @Lookup[@name] in a straight line to a point within Far range and make an attack against all targets in their path. Targets the @Lookup[@name] succeeds against take <strong>2d8+2</strong> physical damage.</p><p>@Template[type:ray|range:f]</p>",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -641,7 +644,7 @@
             "type": "countdown",
             "_id": "BhA3vxCuMs4UbbQU",
             "systemPath": "actions",
-            "description": "<p><em>Countdown (Loop 1d6)</em>. When the Hunter is in the spotlight for the first time, activate the countdown.</p>",
+            "description": "<p><em>Countdown (Loop 1d6)</em>. When the @Lookup[@name] is in the spotlight for the first time, activate the countdown.</p>",
             "chatDisplay": true,
             "originItem": {
               "type": "itemCollection"
@@ -676,7 +679,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "IOCG3J20wUHvyvvh",
       "img": "icons/magic/movement/trail-streak-zigzag-yellow.webp",
diff --git a/src/packs/adversaries/adversary_Oak_Treant_XK78QUfY8c8Go8Uv.json b/src/packs/adversaries/adversary_Oak_Treant_XK78QUfY8c8Go8Uv.json
index 00ba4dfe..c0999e70 100644
--- a/src/packs/adversaries/adversary_Oak_Treant_XK78QUfY8c8Go8Uv.json
+++ b/src/packs/adversaries/adversary_Oak_Treant_XK78QUfY8c8Go8Uv.json
@@ -111,7 +111,8 @@
       "page": 95,
       "artist": ""
     },
-    "motivesAndTactics": "Hide in plain sight, preserve the forest, root down, swing branches"
+    "motivesAndTactics": "Hide in plain sight, preserve the forest, root down, swing branches",
+    "size": "large"
   },
   "flags": {},
   "_id": "XK78QUfY8c8Go8Uv",
@@ -220,7 +221,7 @@
       "name": "Just a Tree",
       "type": "feature",
       "system": {
-        "description": "<p>Before they make their first attack in a fight or after they become Hidden the Treant is indistinguishable from other trees until they next act or a PC succeeds on an Instinct Roll to identify them.</p>",
+        "description": "<p>Before they make their first attack in a fight or after they become Hidden the @Lookup[@name] is indistinguishable from other trees until they next act or a PC succeeds on an Instinct Roll to identify them.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -245,14 +246,14 @@
       "name": "Seed Barrage",
       "type": "feature",
       "system": {
-        "description": "<p>Mark a Stress and make an attack against up to three targets within Close range pummeling them with giant acorns Targets the Treant succeeds against take <strong>2d10+5</strong> physical damage.</p>",
+        "description": "<p><strong>Mark a Stress</strong> and make an attack against up to three targets within Close range pummeling them with giant acorns. Targets the @Lookup[@name] succeeds against take <strong>2d10+5</strong> physical damage.</p>",
         "resource": null,
         "actions": {
           "cM5BBUSFxOHBsV2G": {
             "type": "damage",
             "_id": "cM5BBUSFxOHBsV2G",
             "systemPath": "actions",
-            "description": "<p>Mark a Stress and make an attack against up to three targets within Close range pummeling them with giant acorns Targets the Treant succeeds against take <strong>2d10+5</strong> physical damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -315,7 +316,8 @@
           }
         },
         "originItemType": null,
-        "multiclassOrigin": false
+        "multiclassOrigin": false,
+        "featureForm": "action"
       },
       "_id": "Q2slH9qkBO5SPw43",
       "img": "icons/consumables/nuts/nut-spiked-shell.webp",
@@ -336,7 +338,7 @@
       "name": "Take Root",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Mark a Stress</strong> to Root the Treant in place. The Treant is Restrained while Rooted and can end this effect instead of moving while they are spotlighted. While Rooted the Treant has resistance to physical damage.</p>",
+        "description": "<p><strong>Mark a Stress</strong> to Root the @Lookup[@name] in place. The @Lookup[@name] is Restrained while Rooted and can end this effect instead of moving while they are spotlighted. While Rooted the @Lookup[@name] has resistance to physical damage.</p>",
         "resource": null,
         "actions": {
           "008EelRlcs6CKGvM": {
@@ -378,7 +380,8 @@
           }
         },
         "originItemType": null,
-        "multiclassOrigin": false
+        "multiclassOrigin": false,
+        "featureForm": "action"
       },
       "_id": "sqkgw26P2KiQVtXT",
       "img": "icons/consumables/plants/thorned-stem-brown.webp",
diff --git a/src/packs/adversaries/adversary_Oracle_of_Doom_befIqd5IYKg6eUz2.json b/src/packs/adversaries/adversary_Oracle_of_Doom_befIqd5IYKg6eUz2.json
index 0925049d..66fa5ba1 100644
--- a/src/packs/adversaries/adversary_Oracle_of_Doom_befIqd5IYKg6eUz2.json
+++ b/src/packs/adversaries/adversary_Oracle_of_Doom_befIqd5IYKg6eUz2.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 99,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "_id": "befIqd5IYKg6eUz2",
@@ -226,14 +227,14 @@
       "name": "Terrifying",
       "type": "feature",
       "system": {
-        "description": "<p>When the Oracle makes a successful attack, all PCs within Far range lose a Hope and you gain a Fear.</p><p>@Template[type:emanation|range:f]</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack, all PCs within Far range lose a Hope and you gain a Fear.</p><p>@Template[type:emanation|range:f]</p>",
         "resource": null,
         "actions": {
           "VjdSO1lAdTIAlofM": {
             "type": "damage",
             "_id": "VjdSO1lAdTIAlofM",
             "systemPath": "actions",
-            "description": "<p>When the Oracle makes a successful attack, all PCs within Far range lose a Hope and you gain a Fear.</p><p>@Template[type:emanation|range:f]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -304,14 +305,14 @@
       "name": "Walls Closing In",
       "type": "feature",
       "system": {
-        "description": "<p>When a creature rolls a failure while within Very Far range of the Oracle, they must mark a Stress.</p>",
+        "description": "<p>When a creature rolls a failure while within Very Far range of the @Lookup[@name], they must mark a Stress.</p>",
         "resource": null,
         "actions": {
           "u9iEsvV5ktvOxNp5": {
             "type": "damage",
             "_id": "u9iEsvV5ktvOxNp5",
             "systemPath": "actions",
-            "description": "<p>When a creature rolls a failure while within Very Far range of the Oracle, they must mark a Stress.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -389,7 +390,7 @@
             "type": "attack",
             "_id": "IiSgpy6Axfqo9f9V",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to present a target within Far range with a vision of their personal nightmare. The target must make a Knowledge Reaction Roll. On a failure, they lose all Hope and take <strong>2d20+4</strong> direct magic damage. On a success, they take half damage and lose a Hope.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -467,7 +468,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "QoFecwKWBFzrk4Wp",
       "img": "icons/magic/death/skeleton-skull-soul-blue.webp",
@@ -495,7 +497,7 @@
             "type": "attack",
             "_id": "71UnFo3CBBPtbao3",
             "systemPath": "actions",
-            "description": "<p>Once per day, <strong>spend 2 Fear</strong> to summon <strong>2d4</strong> Tier 2 or below Minions relevant to one of the PC’s personal nightmares. They appear at Close range relative to that PC.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -546,7 +548,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "A4yI2RENCuLk6mg9",
       "img": "icons/magic/death/skull-horned-worn-fire-blue.webp",
@@ -567,11 +570,12 @@
       "name": "Ominous Knowledge",
       "type": "feature",
       "system": {
-        "description": "<p>When the Oracle sees a mortal creature, they instantly know one of their personal nightmares.</p>",
+        "description": "<p>When the @Lookup[@name] sees a mortal creature, they instantly know one of their personal nightmares.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "IPoWZmSQ2kgWek5T",
       "img": "icons/magic/symbols/mask-yellow-orange.webp",
@@ -592,14 +596,14 @@
       "name": "Vengeful Fate",
       "type": "feature",
       "system": {
-        "description": "<p>When the Oracle marks HP from an attack within Very Close range, you can <strong>mark a Stress</strong> to knock the attacker back to Far range and deal <strong>2d10+4</strong> physical damage.</p>",
+        "description": "<p>When the @Lookup[@name] marks HP from an attack within Very Close range, you can <strong>mark a Stress</strong> to knock the attacker back to Far range and deal <strong>2d10+4</strong> physical damage.</p>",
         "resource": null,
         "actions": {
           "vJ7kARKL5H87T1BY": {
             "type": "damage",
             "_id": "vJ7kARKL5H87T1BY",
             "systemPath": "actions",
-            "description": "<p>When the Oracle marks HP from an attack within Very Close range, you can <strong>mark a Stress</strong> to knock the attacker back to Far range and deal <strong>2d10+4</strong> physical damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -657,7 +661,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "kuxTMjy8lOmNSa8e",
       "img": "icons/magic/control/sihouette-hold-beam-green.webp",
diff --git a/src/packs/adversaries/adversary_Outer_Realms_Abomination_A0SeeDzwjvqOsyof.json b/src/packs/adversaries/adversary_Outer_Realms_Abomination_A0SeeDzwjvqOsyof.json
index 8e9d6b37..5b565b8c 100644
--- a/src/packs/adversaries/adversary_Outer_Realms_Abomination_A0SeeDzwjvqOsyof.json
+++ b/src/packs/adversaries/adversary_Outer_Realms_Abomination_A0SeeDzwjvqOsyof.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 99,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "_id": "A0SeeDzwjvqOsyof",
@@ -220,7 +221,7 @@
       "name": "Chaotic Form",
       "type": "feature",
       "system": {
-        "description": "<p>When the Abomination attacks, roll <strong>2d4</strong> and use the result as their attack modifi er.</p>",
+        "description": "<p>When the @Lookup[@name] attacks, roll <strong>2d4</strong> and use the result as their attack modifier.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -245,14 +246,14 @@
       "name": "Disorienting Presence",
       "type": "feature",
       "system": {
-        "description": "<p>When a target takes damage from the Abomination, they must make an Instinct Reaction Roll. On a failure, they gain disadvantage on their next action roll and you gain a Fear.</p>",
+        "description": "<p>When a target takes damage from the @Lookup[@name], they must make an Instinct Reaction Roll. On a failure, they gain disadvantage on their next action roll and you gain a Fear.</p>",
         "resource": null,
         "actions": {
           "4diIu0AzPjitQ94k": {
             "type": "attack",
             "_id": "4diIu0AzPjitQ94k",
             "systemPath": "actions",
-            "description": "<p>When a target takes damage from the Abomination, they must make an Instinct Reaction Roll. On a failure, they gain disadvantage on their next action roll and you gain a Fear.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -366,14 +367,14 @@
       "name": "Reality Quake",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Spend a Fear</strong> to rattle the edges of reality within Far range of the Abomination. All targets within that area must succeed on a Knowledge Reaction Roll or become Unstuck from reality until the end of the scene. When an Unstuck target spends Hope or marks Armor Slots, HP, or Stress, they must double the amount spent or marked.</p><p>@Template[type:emanation|range:f]</p>",
+        "description": "<p><strong>Spend a Fear</strong> to rattle the edges of reality within Far range of the @Lookup[@name]. All targets within that area must succeed on a Knowledge Reaction Roll or become Unstuck from reality until the end of the scene. When an Unstuck target spends Hope or marks Armor Slots, HP, or Stress, they must double the amount spent or marked.</p><p>@Template[type:emanation|range:f]</p>",
         "resource": null,
         "actions": {
           "7apNSLz8m7sxyLhU": {
             "type": "attack",
             "_id": "7apNSLz8m7sxyLhU",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to rattle the edges of reality within Far range of the Abomination. All targets within that area must succeed on a Knowledge Reaction Roll or become Unstuck from reality until the end of the scene. When an Unstuck target spends Hope or marks Armor Slots, HP, or Stress, they must double the amount spent or marked.</p><p>@Template[type:emanation|range:f]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -422,7 +423,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "K3MQO1I42nmfM2F2",
       "img": "icons/magic/sonic/explosion-shock-sound-wave.webp",
@@ -480,14 +482,14 @@
       "name": "Unreal Form",
       "type": "feature",
       "system": {
-        "description": "<p>When the Abomination takes damage, reduce it by <strong>1d20</strong>. If the Abomination marks 1 or fewer Hit Points from a successful attack against them, you gain a Fear.</p>",
+        "description": "<p>When the @Lookup[@name] takes damage, reduce it by <strong>1d20</strong>. If the @Lookup[@name] marks 1 or fewer Hit Points from a successful attack against them, you gain a Fear.</p>",
         "resource": null,
         "actions": {
           "ohpbyDEgSTVJ7qaF": {
             "type": "attack",
             "_id": "ohpbyDEgSTVJ7qaF",
             "systemPath": "actions",
-            "description": "<p>When the Abomination takes damage, reduce it by <strong>1d20</strong>. If the Abomination marks 1 or fewer Hit Points from a successful attack against them, you gain a Fear.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -531,7 +533,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "u9dR2Qh3swHZalXj",
       "img": "icons/magic/unholy/orb-contained-pink.webp",
diff --git a/src/packs/adversaries/adversary_Outer_Realms_Corrupter_ms6nuOl3NFkhPj1k.json b/src/packs/adversaries/adversary_Outer_Realms_Corrupter_ms6nuOl3NFkhPj1k.json
index 4226d346..83fbf4fa 100644
--- a/src/packs/adversaries/adversary_Outer_Realms_Corrupter_ms6nuOl3NFkhPj1k.json
+++ b/src/packs/adversaries/adversary_Outer_Realms_Corrupter_ms6nuOl3NFkhPj1k.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 99,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "ms6nuOl3NFkhPj1k",
@@ -220,14 +221,14 @@
       "name": "Will-Shattering Touch",
       "type": "feature",
       "system": {
-        "description": "<p>When a PC takes damage from the Corrupter, they lose a Hope.</p>",
+        "description": "<p>When a PC takes damage from the @Lookup[@name], they lose a Hope.</p>",
         "resource": null,
         "actions": {
           "q2PUiGoUQqsMghtW": {
             "type": "damage",
             "_id": "q2PUiGoUQqsMghtW",
             "systemPath": "actions",
-            "description": "<p>When a PC takes damage from the Corrupter, they lose a Hope.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -305,7 +306,7 @@
             "type": "attack",
             "_id": "6vX6VHpXX7OiGSWH",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to spew partially digested portions of consumed realities at all targets within Close range. Targets must succeed on a Knowledge Reaction Roll or mark 2 Stress.</p><p>@Template[type:emanation|range:c]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -375,7 +376,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "gBLVvHbyekmIUITD",
       "img": "icons/magic/unholy/barrier-shield-glowing-pink.webp",
diff --git a/src/packs/adversaries/adversary_Outer_Realms_Thrall_moJhHgKqTKPS2WYS.json b/src/packs/adversaries/adversary_Outer_Realms_Thrall_moJhHgKqTKPS2WYS.json
index f5558098..370182a5 100644
--- a/src/packs/adversaries/adversary_Outer_Realms_Thrall_moJhHgKqTKPS2WYS.json
+++ b/src/packs/adversaries/adversary_Outer_Realms_Thrall_moJhHgKqTKPS2WYS.json
@@ -104,7 +104,8 @@
       "source": "Daggerheart SRD",
       "page": 99,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "moJhHgKqTKPS2WYS",
@@ -213,7 +214,7 @@
       "name": "Minion (13)",
       "type": "feature",
       "system": {
-        "description": "<p>The Thrall is defeated when they take any damage. For every 13 damage a PC deals to the Thrall, defeat an additional Minion within range the attack would succeed against.</p>",
+        "description": "<p>The @Lookup[@name] is defeated when they take any damage. For every 13 damage a PC deals to the @Lookup[@name], defeat an additional Minion within range the attack would succeed against.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -238,14 +239,14 @@
       "name": "Group Attack",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all Outer Realm Thralls within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 11 physical damage each. Combine this damage.</p>",
+        "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all @Lookup[@name]s within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 11 physical damage each. Combine this damage.</p>",
         "resource": null,
         "actions": {
           "tvQetauskZoHDR5y": {
             "type": "effect",
             "_id": "tvQetauskZoHDR5y",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all Outer Realm Thralls within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 11 physical damage each. Combine this damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -272,7 +273,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "7DWNmxZvp1Fm3aq3",
       "img": "icons/creatures/abilities/tail-strike-bone-orange.webp",
diff --git a/src/packs/adversaries/adversary_Patchwork_Zombie_Hulk_EQTOAOUrkIvS2z88.json b/src/packs/adversaries/adversary_Patchwork_Zombie_Hulk_EQTOAOUrkIvS2z88.json
index efffaf03..b63e8cb7 100644
--- a/src/packs/adversaries/adversary_Patchwork_Zombie_Hulk_EQTOAOUrkIvS2z88.json
+++ b/src/packs/adversaries/adversary_Patchwork_Zombie_Hulk_EQTOAOUrkIvS2z88.json
@@ -40,11 +40,13 @@
     "experiences": {
       "rLPEhboQmaD7QV7T": {
         "name": "Intimidation",
-        "value": 2
+        "value": 2,
+        "description": ""
       },
       "ejtjcqd5oW6eKnav": {
         "name": "Tear Things Apart",
-        "value": 2
+        "value": 2,
+        "description": ""
       }
     },
     "bonuses": {
@@ -120,7 +122,8 @@
       "source": "Daggerheart SRD",
       "page": 83,
       "artist": ""
-    }
+    },
+    "size": "huge"
   },
   "flags": {},
   "_id": "EQTOAOUrkIvS2z88",
@@ -231,7 +234,7 @@
       "_id": "rEJ1kAfhHQZWhrZj",
       "img": "icons/commodities/biological/hand-clawed-tan.webp",
       "system": {
-        "description": "<p>When the Zombie takes Major or greater damage, they mark an additional HP.</p>",
+        "description": "<p>When the @Lookup[@name] takes Major or greater damage, they mark an additional HP.</p>",
         "resource": null,
         "actions": {
           "Y8LQe5TzbdK2mOG9": {
@@ -314,7 +317,7 @@
       "_id": "0fn7rVLwBnyCyvTA",
       "img": "icons/skills/melee/strike-slashes-orange.webp",
       "system": {
-        "description": "<p>When the Zombie makes a standard attack, they can attack all targets within Very Close range.</p><p>@Template[type:emanation|range:vc]</p>",
+        "description": "<p>When the @Lookup[@name] makes a standard attack, they can attack all targets within Very Close range.</p><p>@Template[type:emanation|range:vc]</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -340,14 +343,14 @@
       "_id": "gw1Z2VazlRXYCiCK",
       "img": "icons/magic/death/skull-trio-badge-purple.webp",
       "system": {
-        "description": "<p>When the Zombie is within Very Close range of a corpse, they can incorporate it into themselves, clearing a HP and a Stress.</p>",
+        "description": "<p>When the @Lookup[@name] is within Very Close range of a corpse, they can incorporate it into themselves, clearing a HP and a Stress.</p>",
         "resource": null,
         "actions": {
           "PfaFRZKFnHGg6mU4": {
             "type": "healing",
             "_id": "PfaFRZKFnHGg6mU4",
             "systemPath": "actions",
-            "description": "<p>When the Zombie is within Very Close range of a corpse, they can incorporate it into themselves, clearing a HP and a Stress.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -438,7 +441,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
@@ -466,7 +470,7 @@
             "type": "attack",
             "_id": "2NYC0D7wkBNrUAKl",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to cause all PCs within Far range to make a Presence Reaction Roll (13). Targets who fail lose a Hope and you gain a Fear for each. Targets who succeed must mark a Stress.</p><p>@Template[type:emanation|range:f]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -544,7 +548,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
diff --git a/src/packs/adversaries/adversary_Perfected_Zombie_CP6iRfHdyFWniTHY.json b/src/packs/adversaries/adversary_Perfected_Zombie_CP6iRfHdyFWniTHY.json
index ae8bb68f..e3da56b6 100644
--- a/src/packs/adversaries/adversary_Perfected_Zombie_CP6iRfHdyFWniTHY.json
+++ b/src/packs/adversaries/adversary_Perfected_Zombie_CP6iRfHdyFWniTHY.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 101,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "_id": "CP6iRfHdyFWniTHY",
@@ -220,14 +221,14 @@
       "name": "Terrifying",
       "type": "feature",
       "system": {
-        "description": "<p>When the Zombie makes a successful attack, all PCs within Far range lose a Hope and you gain a Fear.</p><p>@Template[type:emanation|range:f]</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack, all PCs within Far range lose a Hope and you gain a Fear.</p><p>@Template[type:emanation|range:f]</p>",
         "resource": null,
         "actions": {
           "dquYnt5qiHZfnyD9": {
             "type": "damage",
             "_id": "dquYnt5qiHZfnyD9",
             "systemPath": "actions",
-            "description": "<p>When the Zombie makes a successful attack, all PCs within Far range lose a Hope and you gain a Fear.</p><p>@Template[type:emanation|range:f]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -298,7 +299,7 @@
       "name": "Fearsome Presence",
       "type": "feature",
       "system": {
-        "description": "<p>PCs can’t spend Hope to use features against the Zombie.</p>",
+        "description": "<p>PCs can’t spend Hope to use features against the @Lookup[@name].</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -323,14 +324,14 @@
       "name": "Perfect Strike",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Mark a Stress </strong>to make a standard attack against all targets within Very Close range. Targets the Zombie succeeds against are <em>Vulnerable</em> until their next rest.</p><p>@Template[type:emanation|range:vc]</p>",
+        "description": "<p><strong>Mark a Stress </strong>to make a standard attack against all targets within Very Close range. Targets the @Lookup[@name] succeeds against are <em>Vulnerable</em> until their next rest.</p><p>@Template[type:emanation|range:vc]</p>",
         "resource": null,
         "actions": {
           "un9btM1mN53JHIgV": {
             "type": "attack",
             "_id": "un9btM1mN53JHIgV",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress </strong>to make a standard attack against all targets within Very Close range. Targets the Zombie succeeds against are <em>Vulnerable</em> until their next rest.</p><p>@Template[type:emanation|range:vc]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -413,7 +414,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "CKy2r6FguyTSO9Fm",
       "img": "icons/skills/melee/strike-axe-energy-pink.webp",
@@ -444,7 +446,7 @@
             "startRound": null,
             "startTurn": null
           },
-          "description": "<p><em>Vulnerable</em> until yournext rest.</p>",
+          "description": "<p><em>Vulnerable</em> until your next rest.</p>",
           "tint": "#ffffff",
           "statuses": [
             "vulnerable"
@@ -473,14 +475,14 @@
       "name": "Skilled Opportunist",
       "type": "feature",
       "system": {
-        "description": "<p>When another adversary deals damage to a target within Very Close range of the Zombie, you can <strong>spend a Fear</strong> to add the Zombie’s standard attack damage to the damage roll.</p>",
+        "description": "<p>When another adversary deals damage to a target within Very Close range of the @Lookup[@name], you can <strong>spend a Fear</strong> to add the @Lookup[@name]’s standard attack damage to the damage roll.</p>",
         "resource": null,
         "actions": {
           "To2z7XQItxcMxKBp": {
             "type": "effect",
             "_id": "To2z7XQItxcMxKBp",
             "systemPath": "actions",
-            "description": "<p>When another adversary deals damage to a target within Very Close range of the Zombie, you can <strong>spend a Fear</strong> to add the Zombie’s standard attack damage to the damage roll.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -500,7 +502,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "hWxjmdc1O5J1otLM",
       "img": "icons/magic/perception/shadow-stealth-eyes-purple.webp",
diff --git a/src/packs/adversaries/adversary_Petty_Noble_wycLpvebWdUqRhpP.json b/src/packs/adversaries/adversary_Petty_Noble_wycLpvebWdUqRhpP.json
index fc5d8f01..4ac7e746 100644
--- a/src/packs/adversaries/adversary_Petty_Noble_wycLpvebWdUqRhpP.json
+++ b/src/packs/adversaries/adversary_Petty_Noble_wycLpvebWdUqRhpP.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 80,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "wycLpvebWdUqRhpP",
@@ -228,7 +229,7 @@
       "_id": "Jbq36nElH6RDacLU",
       "img": "icons/skills/social/diplomacy-writing-letter.webp",
       "system": {
-        "description": "<p> All social actions made against the Noble on their land have disadvantage.</p>",
+        "description": "<p>All social actions made against the @Lookup[@name] on their land have disadvantage.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -254,7 +255,7 @@
       "_id": "ebdAPBso5ROmdFNO",
       "img": "icons/environment/people/infantry-armored.webp",
       "system": {
-        "description": "<p>Once per scene, <strong>mark a Stress</strong> to summon <strong>1d4</strong> @UUID[Compendium.daggerheart.adversaries.Actor.B4LZcGuBAHzyVdzy]{Bladed Guards}, who appear at Far range to enforce the Noble’s will.</p>",
+        "description": "<p>Once per scene, <strong>mark a Stress</strong> to summon <strong>1d4</strong> @UUID[Compendium.daggerheart.adversaries.Actor.B4LZcGuBAHzyVdzy]{Bladed Guards}, who appear at Far range to enforce the @Lookup[@name]’s will.</p>",
         "resource": null,
         "actions": {
           "cUKwhq1imsTVru8D": {
@@ -313,7 +314,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
@@ -334,14 +336,14 @@
       "_id": "xN09fSsg33nURqpk",
       "img": "icons/commodities/currency/coin-embossed-skull-gold.webp",
       "system": {
-        "description": "<p><strong>Spend a Fear</strong> and target a PC. The Noble proclaims that the target and their allies are exiled from the noble’s territory. While exiled, the target and their allies have disadvantage during social situations within the Noble’s domain.</p>",
+        "description": "<p><strong>Spend a Fear</strong> and target a PC. The @Lookup[@name] proclaims that the target and their allies are exiled from the @Lookup[@name]’s territory. While exiled, the target and their allies have disadvantage during social situations within the @Lookup[@name]’s domain.</p>",
         "resource": null,
         "actions": {
           "dAHzRxf0iztyc1mI": {
             "type": "effect",
             "_id": "dAHzRxf0iztyc1mI",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> and target a PC. The Noble proclaims that the target and their allies are exiled from the noble’s territory. While exiled, the target and their allies have disadvantage during social situations within the Noble’s domain.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -369,7 +371,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
diff --git a/src/packs/adversaries/adversary_Pirate_Captain_OROJbjsqagVh7ECV.json b/src/packs/adversaries/adversary_Pirate_Captain_OROJbjsqagVh7ECV.json
index 5b3db044..409d7698 100644
--- a/src/packs/adversaries/adversary_Pirate_Captain_OROJbjsqagVh7ECV.json
+++ b/src/packs/adversaries/adversary_Pirate_Captain_OROJbjsqagVh7ECV.json
@@ -122,7 +122,8 @@
       "source": "Daggerheart SRD",
       "page": 81,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "OROJbjsqagVh7ECV",
@@ -233,14 +234,14 @@
       "_id": "PsMA3x6giL8tixbf",
       "img": "icons/magic/control/mouth-smile-deception-purple.webp",
       "system": {
-        "description": "<p>When the Captain marks 2 or fewer HP from an attack within Melee range, the attacker must mark a Stress.</p>",
+        "description": "<p>When the @Lookup[@name] marks 2 or fewer HP from an attack within Melee range, the attacker must mark a Stress.</p>",
         "resource": null,
         "actions": {
           "xYphrI8GtMHHuT9a": {
             "type": "damage",
             "_id": "xYphrI8GtMHHuT9a",
             "systemPath": "actions",
-            "description": "<p>When the Captain marks 2 or fewer HP from an attack within Melee range, the attacker must mark a Stress.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -319,7 +320,7 @@
             "type": "effect",
             "_id": "NlgIp0KrmZoS27Xy",
             "systemPath": "actions",
-            "description": "<p>Once per scene, <strong>mark a Stress</strong> to summon a Pirate Raiders Horde, which appears at Far range.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -347,7 +348,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
@@ -368,14 +370,14 @@
       "_id": "brHnMc0TDiWVT4U6",
       "img": "icons/magic/death/skull-energy-light-purple.webp",
       "system": {
-        "description": "<p><strong>Spend a Fear</strong> to choose a target who has three or more Pirates within Melee range of them. The Captain leads the Pirates in hurling threats and promises of a watery grave. The target must make a Presence Reaction Roll. On a failure, the target marks <strong>1d4+1</strong> Stress. On a success, they must mark a Stress.</p>",
+        "description": "<p><strong>Spend a Fear</strong> to choose a target who has three or more Pirates within Melee range of them. The @Lookup[@name] leads the Pirates in hurling threats and promises of a watery grave. The target must make a Presence Reaction Roll. On a failure, the target marks <strong>1d4+1</strong> Stress. On a success, they must mark a Stress.</p>",
         "resource": null,
         "actions": {
           "h2vM7jDTeFttVJKN": {
             "type": "attack",
             "_id": "h2vM7jDTeFttVJKN",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to choose a target who has three or more Pirates within Melee range of them. The Captain leads the Pirates in hurling threats and promises of a watery grave. The target must make a Presence Reaction Roll. On a failure, the target marks <strong>1d4+1</strong> Stress. On a success, they must mark a Stress.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -452,7 +454,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
@@ -473,14 +476,14 @@
       "_id": "V4EcsqMd70BTrDNu",
       "img": "icons/skills/melee/strike-weapons-orange.webp",
       "system": {
-        "description": "<p>When the Captain makes a successful attack against a PC, you gain a Fear.</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack against a PC, you gain a Fear.</p>",
         "resource": null,
         "actions": {
           "78Qphxjbs7cOYsNf": {
             "type": "healing",
             "_id": "78Qphxjbs7cOYsNf",
             "systemPath": "actions",
-            "description": "<p>When the Captain makes a successful attack against a PC, you gain a Fear.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -548,7 +551,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "effects": [],
       "folder": null,
diff --git a/src/packs/adversaries/adversary_Pirate_Raiders_5YgEajn0wa4i85kC.json b/src/packs/adversaries/adversary_Pirate_Raiders_5YgEajn0wa4i85kC.json
index dd69529d..7d3733ce 100644
--- a/src/packs/adversaries/adversary_Pirate_Raiders_5YgEajn0wa4i85kC.json
+++ b/src/packs/adversaries/adversary_Pirate_Raiders_5YgEajn0wa4i85kC.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 81,
       "artist": ""
-    }
+    },
+    "size": "huge"
   },
   "flags": {},
   "_id": "5YgEajn0wa4i85kC",
@@ -228,7 +229,7 @@
       "_id": "Q7DRbWjHl64CNwag",
       "img": "icons/creatures/magical/humanoid-silhouette-aliens-green.webp",
       "system": {
-        "description": "<p>When the Raiders have marked half or more of their HP, their standard attack deals <strong>1d4+1</strong> physical damage instead.</p>",
+        "description": "<p>When the @Lookup[@name] have marked half or more of their HP, their standard attack deals <strong>1d4+1</strong> physical damage instead.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -254,14 +255,14 @@
       "_id": "N401rF937fLXMuMA",
       "img": "icons/magic/control/mouth-smile-deception-purple.webp",
       "system": {
-        "description": "<p>When the Raiders mark 2 or fewer HP from an attack within Melee range, the attacker must mark a Stress.</p>",
+        "description": "<p>When the @Lookup[@name] mark 2 or fewer HP from an attack within Melee range, the attacker must mark a Stress.</p>",
         "resource": null,
         "actions": {
           "ejadA9jjMnVNVczS": {
             "type": "damage",
             "_id": "ejadA9jjMnVNVczS",
             "systemPath": "actions",
-            "description": "<p>When the Raiders mark 2 or fewer HP from an attack within Melee range, the attacker must mark a Stress.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
diff --git a/src/packs/adversaries/adversary_Pirate_Tough_mhcVkVFrzIJ18FDm.json b/src/packs/adversaries/adversary_Pirate_Tough_mhcVkVFrzIJ18FDm.json
index 919b8aaf..69b59211 100644
--- a/src/packs/adversaries/adversary_Pirate_Tough_mhcVkVFrzIJ18FDm.json
+++ b/src/packs/adversaries/adversary_Pirate_Tough_mhcVkVFrzIJ18FDm.json
@@ -150,7 +150,8 @@
       "source": "Daggerheart SRD",
       "page": 81,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "prototypeToken": {
     "name": "Pirate Tough",
@@ -251,14 +252,14 @@
       "name": "Swashbuckler",
       "type": "feature",
       "system": {
-        "description": "<p>When the Tough marks 2 or fewer HP from an attack within Melee range, the attacker must mark a Stress.</p>",
+        "description": "<p>When the @Lookup[@name] marks 2 or fewer HP from an attack within Melee range, the attacker must mark a Stress.</p>",
         "resource": null,
         "actions": {
           "xg3K78wfOhg8oCd3": {
             "type": "damage",
             "_id": "xg3K78wfOhg8oCd3",
             "systemPath": "actions",
-            "description": "<p>When the Tough marks 2 or fewer HP from an attack within Melee range, the attacker must mark a Stress.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -336,7 +337,7 @@
             "type": "attack",
             "_id": "uJl1NJQ55yd9oCwz",
             "systemPath": "actions",
-            "description": "<p>Make an attack against a target within Very Close range. On a success, <strong>mark a Stress</strong> to move into Melee range of the target, dealing <strong>3d4</strong> physical damage and knocking the target back to Close range.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -407,7 +408,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "uzlxE1Cxm9GGmrNs",
       "img": "icons/skills/melee/unarmed-punch-fist-blue.webp",
diff --git a/src/packs/adversaries/adversary_Red_Ooze_9rVlbJVrDNn1x7PS.json b/src/packs/adversaries/adversary_Red_Ooze_9rVlbJVrDNn1x7PS.json
index f555999d..320b71af 100644
--- a/src/packs/adversaries/adversary_Red_Ooze_9rVlbJVrDNn1x7PS.json
+++ b/src/packs/adversaries/adversary_Red_Ooze_9rVlbJVrDNn1x7PS.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 80,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "9rVlbJVrDNn1x7PS",
@@ -228,7 +229,7 @@
       "_id": "QGQTLWXIMMLUvm7c",
       "img": "icons/magic/fire/flame-burning-embers-yellow.webp",
       "system": {
-        "description": "<p>The Ooze can only move within Very Close range as their normal movement. They light any flammable object they touch on fi re.</p>",
+        "description": "<p>The @Lookup[@name] can only move within Very Close range as their normal movement. They light any flammable object they touch on fi re.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -261,7 +262,7 @@
             "type": "attack",
             "_id": "b4g8XUIKLhxDlUPy",
             "systemPath": "actions",
-            "description": "<p>Make an attack against a target within Very Close range. On a success, the target takes <strong>1d8</strong> magic damage and is Ignited until they’re extinguished with a successful Finesse Roll (14). While Ignited, the target takes <strong>1d4</strong> magic damage when they make an action roll.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -391,7 +392,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [
         {
@@ -449,14 +451,14 @@
       "_id": "M9gAcPrgKfSg9Tjb",
       "img": "icons/creatures/slimes/slime-movement-splashing-red.webp",
       "system": {
-        "description": "<p>When the Ooze has 3 or more HP marked, you can <strong>spend a Fear</strong> to split them into two @UUID[Compendium.daggerheart.adversaries.Actor.1fkLQXVtmILqfJ44]{Tiny Red Oozes} (with no marked HP or Stress). Immediately spotlight both of them.</p>",
+        "description": "<p>When the @Lookup[@name] has 3 or more HP marked, you can <strong>spend a Fear</strong> to split them into two @UUID[Compendium.daggerheart.adversaries.Actor.1fkLQXVtmILqfJ44]{Tiny Red Oozes} (with no marked HP or Stress). Immediately spotlight both of them.</p>",
         "resource": null,
         "actions": {
           "dw6Juw8mriH7sg0e": {
             "type": "effect",
             "_id": "dw6Juw8mriH7sg0e",
             "systemPath": "actions",
-            "description": "<p>When the Ooze has 3 or more HP marked, you can <strong>spend a Fear</strong> to split them into two @UUID[Compendium.daggerheart.adversaries.Actor.1fkLQXVtmILqfJ44]{Tiny Red Oozes} (with no marked HP or Stress). Immediately spotlight both of them.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -484,7 +486,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "effects": [],
       "folder": null,
diff --git a/src/packs/adversaries/adversary_Rotted_Zombie_gP3fWTLzSFnpA8EJ.json b/src/packs/adversaries/adversary_Rotted_Zombie_gP3fWTLzSFnpA8EJ.json
index 461846a2..a9bf3a67 100644
--- a/src/packs/adversaries/adversary_Rotted_Zombie_gP3fWTLzSFnpA8EJ.json
+++ b/src/packs/adversaries/adversary_Rotted_Zombie_gP3fWTLzSFnpA8EJ.json
@@ -104,7 +104,8 @@
       "source": "Daggerheart SRD",
       "page": 83,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "gP3fWTLzSFnpA8EJ",
@@ -215,7 +216,7 @@
       "_id": "cwV1kNkNrrrHWEwX",
       "img": "icons/magic/symbols/runes-carved-stone-yellow.webp",
       "system": {
-        "description": "<p>The Zombie is defeated when they take any damage. For every 3 damage a PC deals to the Zombie, defeat an additional Minion within range the attack would succeed against.</p>",
+        "description": "<p>The @Lookup[@name] is defeated when they take any damage. For every 3 damage a PC deals to the @Lookup[@name], defeat an additional Minion within range the attack would succeed against.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -241,14 +242,14 @@
       "_id": "R9vrwFNl5BD1YXJo",
       "img": "icons/creatures/abilities/tail-strike-bone-orange.webp",
       "system": {
-        "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all Rotted Zombies within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 2 physical damage each. Combine this damage.</p>",
+        "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all @Lookup[@name]s within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 2 physical damage each. Combine this damage.</p>",
         "resource": null,
         "actions": {
           "DJBNtd3hWjwsjPwq": {
             "type": "effect",
             "_id": "DJBNtd3hWjwsjPwq",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all Rotted Zombies within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 2 physical damage each. Combine this damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -276,7 +277,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
diff --git a/src/packs/adversaries/adversary_Royal_Advisor_EtLJiTsilPPZvLUX.json b/src/packs/adversaries/adversary_Royal_Advisor_EtLJiTsilPPZvLUX.json
index 36c5a617..8593ec01 100644
--- a/src/packs/adversaries/adversary_Royal_Advisor_EtLJiTsilPPZvLUX.json
+++ b/src/packs/adversaries/adversary_Royal_Advisor_EtLJiTsilPPZvLUX.json
@@ -122,7 +122,8 @@
       "source": "Daggerheart SRD",
       "page": 89,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "EtLJiTsilPPZvLUX",
@@ -231,14 +232,14 @@
       "name": "Devastating Retort",
       "type": "feature",
       "system": {
-        "description": "<p>A PC who rolls less than 17 on an action roll targeting the Advisor must mark a Stress.</p>",
+        "description": "<p>A PC who rolls less than 17 on an action roll targeting the @Lookup[@name] must mark a Stress.</p>",
         "resource": null,
         "actions": {
           "gtM7UPq6xHgJHPPp": {
             "type": "damage",
             "_id": "gtM7UPq6xHgJHPPp",
             "systemPath": "actions",
-            "description": "<p>A PC who rolls less than 17 on an action roll targeting the Advisor must mark a Stress.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -309,14 +310,14 @@
       "name": "Bend Ears",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Mark a Stress</strong> to influence an NPC within Melee range with whispered words. That target’s opinion on one matter shifts toward the Advisor’s preference unless it is in direct opposition to the target’s motives.</p>",
+        "description": "<p><strong>Mark a Stress</strong> to influence an NPC within Melee range with whispered words. That target’s opinion on one matter shifts toward the @Lookup[@name]’s preference unless it is in direct opposition to the target’s motives.</p>",
         "resource": null,
         "actions": {
           "JNFTnARlTAKermLx": {
             "type": "effect",
             "_id": "JNFTnARlTAKermLx",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to influence an NPC within Melee range with whispered words. That target’s opinion on one matter shifts toward the Advisor’s preference unless it is in direct opposition to the target’s motives.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -343,7 +344,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "lG6vMc0zUbijpvCM",
       "img": "icons/skills/social/diplomacy-handshake.webp",
@@ -371,7 +373,7 @@
             "type": "effect",
             "_id": "6oaHwUVWTmF362vI",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to convince a crowd or notable individual that one person or group is responsible for some problem facing the target. The target becomes hostile to the scapegoat until convinced of their innocence with a successful Presence Roll (17).</p><p>[[/dr trait=presence difficulty=17]]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -398,7 +400,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "iwNrNBbvm3RMgSw5",
       "img": "icons/skills/social/diplomacy-unity-alliance.webp",
diff --git a/src/packs/adversaries/adversary_Secret_Keeper_sLAccjvCWfeedbpI.json b/src/packs/adversaries/adversary_Secret_Keeper_sLAccjvCWfeedbpI.json
index 113d8f73..0c8757c5 100644
--- a/src/packs/adversaries/adversary_Secret_Keeper_sLAccjvCWfeedbpI.json
+++ b/src/packs/adversaries/adversary_Secret_Keeper_sLAccjvCWfeedbpI.json
@@ -122,7 +122,8 @@
       "source": "Daggerheart SRD",
       "page": 89,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "sLAccjvCWfeedbpI",
@@ -238,7 +239,7 @@
             "type": "attack",
             "_id": "e6DmGF9vOv27BJ6f",
             "systemPath": "actions",
-            "description": "<p><strong>Spend 2 Fear</strong> to spotlight <strong>1d4</strong> allies. Attacks they make while spotlighted in this way deal half damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -289,7 +290,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "WLnguxRo9egh2hfX",
       "img": "icons/skills/movement/arrows-up-trio-red.webp",
@@ -317,7 +319,7 @@
             "type": "healing",
             "_id": "MUdqLSRIpEEk1Ujc",
             "systemPath": "actions",
-            "description": "<p>When you spotlight an ally within Far range, <strong>mark a Stress</strong> to gain a Fear.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -389,7 +391,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "O5Nn1Slv8RJJpNeT",
       "img": "icons/magic/unholy/hand-claw-glow-orange.webp",
@@ -410,7 +413,7 @@
       "name": "Summoning Ritual",
       "type": "feature",
       "system": {
-        "description": "<p><em>Countdown (6)</em>. When the Secret-Keeper is in the spotlight for the first time, activate the countdown. When they mark HP, tick down this countdown by the number of HP marked. When it triggers, summon a @UUID[Compendium.daggerheart.adversaries.Actor.3tqCjDwJAQ7JKqMb]{Minor Demon} who appears at Close range.</p>",
+        "description": "<p><em>Countdown (6)</em>. When the @Lookup[@name] is in the spotlight for the first time, activate the countdown. When they mark HP, tick down this countdown by the number of HP marked. When it triggers, summon a @UUID[Compendium.daggerheart.adversaries.Actor.3tqCjDwJAQ7JKqMb]{Minor Demon} who appears at Close range.</p>",
         "resource": null,
         "actions": {
           "0rixG6jLRynAYNqA": {
@@ -439,7 +442,7 @@
             "type": "countdown",
             "_id": "ZVXHY2fpomoKV7jG",
             "systemPath": "actions",
-            "description": "<p><em>Countdown (6)</em>. When the Secret-Keeper is in the spotlight for the first time, activate the countdown.</p>",
+            "description": "<p><em>Countdown (6)</em>. When the @Lookup[@name] is in the spotlight for the first time, activate the countdown.</p>",
             "chatDisplay": true,
             "originItem": {
               "type": "itemCollection"
@@ -474,7 +477,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "4L7aM9NDLbjvuwI3",
       "img": "icons/magic/unholy/silhouette-light-fire-blue.webp",
@@ -495,14 +499,14 @@
       "name": "Fallen Hounds",
       "type": "feature",
       "system": {
-        "description": "<p>Once per scene, when the SecretKeeper marks 2 or more HP, you can <strong>mark a Stress</strong> to summon a @UUID[Compendium.daggerheart.adversaries.Actor.NoRZ1PqB8N5wcIw0]{Demonic Hound Pack}, which appears at Close range and is immediately spotlighted.</p>",
+        "description": "<p>Once per scene, when the @Lookup[@name] marks 2 or more HP, you can <strong>mark a Stress</strong> to summon a @UUID[Compendium.daggerheart.adversaries.Actor.NoRZ1PqB8N5wcIw0]{Demonic Hound Pack}, which appears at Close range and is immediately spotlighted.</p>",
         "resource": null,
         "actions": {
           "JBuQUJhif2A7IlJd": {
             "type": "effect",
             "_id": "JBuQUJhif2A7IlJd",
             "systemPath": "actions",
-            "description": "<p>Once per scene, when the SecretKeeper marks 2 or more HP, you can <strong>mark a Stress</strong> to summon a @UUID[Compendium.daggerheart.adversaries.Actor.NoRZ1PqB8N5wcIw0]{Demonic Hound Pack}, which appears at Close range and is immediately spotlighted.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -529,7 +533,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "Q28NPuSMccjzykib",
       "img": "icons/creatures/unholy/demon-fire-horned-clawed.webp",
diff --git a/src/packs/adversaries/adversary_Sellsword_bgreCaQ6ap2DVpCr.json b/src/packs/adversaries/adversary_Sellsword_bgreCaQ6ap2DVpCr.json
index 8f490686..e26b48eb 100644
--- a/src/packs/adversaries/adversary_Sellsword_bgreCaQ6ap2DVpCr.json
+++ b/src/packs/adversaries/adversary_Sellsword_bgreCaQ6ap2DVpCr.json
@@ -104,7 +104,8 @@
       "source": "Daggerheart SRD",
       "page": 81,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "bgreCaQ6ap2DVpCr",
@@ -215,7 +216,7 @@
       "_id": "nLlbuGTKAvsFRnUB",
       "img": "icons/magic/symbols/runes-carved-stone-yellow.webp",
       "system": {
-        "description": "<p>The Sellsword is defeated when they take any damage. For every 4 damage a PC deals to the Sellsword, defeat an additional Minion within range the attack would succeed against.</p>",
+        "description": "<p>The @Lookup[@name] is defeated when they take any damage. For every 4 damage a PC deals to the @Lookup[@name], defeat an additional Minion within range the attack would succeed against.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -241,14 +242,14 @@
       "_id": "CQZQiEiRH70Br5Ge",
       "img": "icons/creatures/abilities/tail-strike-bone-orange.webp",
       "system": {
-        "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all Sellswords within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 3 physical damage each. Combine this damage.</p>",
+        "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all @Lookup[@name]s within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 3 physical damage each. Combine this damage.</p>",
         "resource": null,
         "actions": {
           "ghgFZskDiizJDjcn": {
             "type": "effect",
             "_id": "ghgFZskDiizJDjcn",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all Sellswords within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 3 physical damage each. Combine this damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -276,7 +277,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
diff --git a/src/packs/adversaries/adversary_Shambling_Zombie_2nXz4ilAY4xuhKLm.json b/src/packs/adversaries/adversary_Shambling_Zombie_2nXz4ilAY4xuhKLm.json
index 2e6d7fd2..7c3925ac 100644
--- a/src/packs/adversaries/adversary_Shambling_Zombie_2nXz4ilAY4xuhKLm.json
+++ b/src/packs/adversaries/adversary_Shambling_Zombie_2nXz4ilAY4xuhKLm.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 84,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "2nXz4ilAY4xuhKLm",
@@ -222,7 +223,7 @@
       "_id": "IpUWqXjwP2Lp5Zhs",
       "img": "icons/magic/death/undead-zombie-grave-green.webp",
       "system": {
-        "description": "<p>When the Zombie is within Melee range of a creature and at least one other Zombie is within Close range, all attacks against that creature have advantage.</p>",
+        "description": "<p>When the @Lookup[@name] is within Melee range of a creature and at least one other @Lookup[@name] is within Close range, all attacks against that creature have advantage.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -248,14 +249,14 @@
       "_id": "iiOjamlZIuhpDC8W",
       "img": "icons/magic/death/skull-energy-light-purple.webp",
       "system": {
-        "description": "<p>Targets who mark HP from the Zombie’s attacks must also mark a Stress.</p>",
+        "description": "<p>Targets who mark HP from the @Lookup[@name]’s attacks must also mark a Stress.</p>",
         "resource": null,
         "actions": {
           "JUw16Jag9uTfBmKZ": {
             "type": "damage",
             "_id": "JUw16Jag9uTfBmKZ",
             "systemPath": "actions",
-            "description": "<p>Targets who mark HP from the Zombie’s attacks must also mark a Stress.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
diff --git a/src/packs/adversaries/adversary_Shark_YmVAkdNsyuXWTtYp.json b/src/packs/adversaries/adversary_Shark_YmVAkdNsyuXWTtYp.json
index 8729ac0a..e385a6c5 100644
--- a/src/packs/adversaries/adversary_Shark_YmVAkdNsyuXWTtYp.json
+++ b/src/packs/adversaries/adversary_Shark_YmVAkdNsyuXWTtYp.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 90,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "YmVAkdNsyuXWTtYp",
@@ -220,14 +221,14 @@
       "name": "Terrifying",
       "type": "feature",
       "system": {
-        "description": "<p>When the Shark makes a successful attack, all PCs within Far range lose a Hope and you gain a Fear.</p><p>@Template[type:emanation|range:f]</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack, all PCs within Far range lose a Hope and you gain a Fear.</p><p>@Template[type:emanation|range:f]</p>",
         "resource": null,
         "actions": {
           "NoEb6qR3ktIu9kRJ": {
             "type": "damage",
             "_id": "NoEb6qR3ktIu9kRJ",
             "systemPath": "actions",
-            "description": "<p>When the Shark makes a successful attack, all PCs within Far range lose a Hope and you gain a Fear.</p><p>@Template[type:emanation|range:f]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -298,14 +299,14 @@
       "name": "Rending Bite",
       "type": "feature",
       "system": {
-        "description": "<p>When the Shark makes a successful attack, the target must mark an Armor Slot without receiving its benefits (they can still use armor to reduce the damage). If they can’t mark an Armor Slot, they must mark an additional HP.</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack, the target must mark an Armor Slot without receiving its benefits (they can still use armor to reduce the damage). If they can’t mark an Armor Slot, they must mark an additional HP.</p>",
         "resource": null,
         "actions": {
           "a0gC7uWycUB2NgKS": {
             "type": "attack",
             "_id": "a0gC7uWycUB2NgKS",
             "systemPath": "actions",
-            "description": "<p>When the Shark makes a successful attack, the target must mark an Armor Slot without receiving its benefits (they can still use armor to reduce the damage). If they can’t mark an Armor Slot, they must mark an additional HP.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -422,14 +423,14 @@
       "name": "Blood in the Water",
       "type": "feature",
       "system": {
-        "description": "<p>When a creature within Close range of the Shark marks HP from another creature’s attack, you can <strong>mark a Stress</strong> to immediately spotlight the Shark, moving them into Melee range of the target and making a standard attack.</p>",
+        "description": "<p>When a creature within Close range of the @Lookup[@name] marks HP from another creature’s attack, you can <strong>mark a Stress</strong> to immediately spotlight the @Lookup[@name], moving them into Melee range of the target and making a standard attack.</p>",
         "resource": null,
         "actions": {
           "sE9KRd9siZeYHPhb": {
             "type": "effect",
             "_id": "sE9KRd9siZeYHPhb",
             "systemPath": "actions",
-            "description": "<p>When a creature within Close range of the Shark marks HP from another creature’s attack, you can <strong>mark a Stress</strong> to immediately spotlight the Shark, moving them into Melee range of the target and making a standard attack.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -456,7 +457,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "LBKPfi8XktBAwbrt",
       "img": "icons/skills/wounds/blood-spurt-spray-red.webp",
diff --git a/src/packs/adversaries/adversary_Siren_BK4jwyXSRx7IOQiO.json b/src/packs/adversaries/adversary_Siren_BK4jwyXSRx7IOQiO.json
index 4e3f2aca..a72c6d46 100644
--- a/src/packs/adversaries/adversary_Siren_BK4jwyXSRx7IOQiO.json
+++ b/src/packs/adversaries/adversary_Siren_BK4jwyXSRx7IOQiO.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 90,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "BK4jwyXSRx7IOQiO",
@@ -226,14 +227,14 @@
       "name": "Captive Audience",
       "type": "feature",
       "system": {
-        "description": "<p>If the Siren makes a standard attack against a target Entranced by their song, the attack deals <strong>2d10+1</strong> damage instead of their standard damage.</p>",
+        "description": "<p>If the @Lookup[@name] makes a standard attack against a target Entranced by their song, the attack deals <strong>2d10+1</strong> damage instead of their standard damage.</p>",
         "resource": null,
         "actions": {
           "FxWbdt0hRNv2k9Pm": {
             "type": "attack",
             "_id": "FxWbdt0hRNv2k9Pm",
             "systemPath": "actions",
-            "description": "<p>If the Siren makes a standard attack against a target Entranced by their song, the attack deals <strong>2d10+1</strong> damage instead of their standard damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -325,14 +326,14 @@
       "name": "Enchanting Song",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Spend a Fear</strong> to sing a song that affects all targets within Close range. Targets must succeed on an Instinct Reaction Roll or become Entranced until they mark 2 Stress. Other Sirens within Close range of the target can <strong>mark a Stress</strong> to each add a +1 bonus to the Difficulty of the reaction roll. While Entranced, a target can’t act and is <em>Vulnerable</em>.</p><p>@Template[type:emanation|range:c]</p>",
+        "description": "<p><strong>Spend a Fear</strong> to sing a song that affects all targets within Close range. Targets must succeed on an Instinct Reaction Roll or become Entranced until they mark 2 Stress. Other @Lookup[@name]s within Close range of the target can <strong>mark a Stress</strong> to each add a +1 bonus to the Difficulty of the reaction roll. While Entranced, a target can’t act and is <em>Vulnerable</em>.</p><p>@Template[type:emanation|range:c]</p>",
         "resource": null,
         "actions": {
           "FY8K8Nsg0TKAWok8": {
             "type": "attack",
             "_id": "FY8K8Nsg0TKAWok8",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to sing a song that affects all targets within Close range. Targets must succeed on an Instinct Reaction Roll or become Entranced until they mark 2 Stress. Other Sirens within Close range of the target can <strong>mark a Stress</strong> to each add a +1 bonus to the Difficulty of the reaction roll. While Entranced, a target can’t act and is <em>Vulnerable</em>.</p><p>@Template[type:emanation|range:c]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -388,7 +389,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "Ks3HpB4W1l5FqR7p",
       "img": "icons/magic/control/hypnosis-mesmerism-eye.webp",
diff --git a/src/packs/adversaries/adversary_Skeleton_Archer_7X5q7a6ueeHs5oA9.json b/src/packs/adversaries/adversary_Skeleton_Archer_7X5q7a6ueeHs5oA9.json
index aeb2dd0e..e5381f6f 100644
--- a/src/packs/adversaries/adversary_Skeleton_Archer_7X5q7a6ueeHs5oA9.json
+++ b/src/packs/adversaries/adversary_Skeleton_Archer_7X5q7a6ueeHs5oA9.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 81,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "7X5q7a6ueeHs5oA9",
@@ -222,7 +223,7 @@
       "_id": "6mL2FQ9pQdfoDNzG",
       "img": "icons/skills/targeting/crosshair-triple-strike-orange.webp",
       "system": {
-        "description": "<p>When two or more adversaries are within Very Close range of a creature, all damage the Archer deals to that creature is doubled.</p>",
+        "description": "<p>When two or more adversaries are within Very Close range of a creature, all damage the @Lookup[@name] deals to that creature is doubled.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -255,7 +256,7 @@
             "type": "attack",
             "_id": "nKmxl3D7g4p7Zcub",
             "systemPath": "actions",
-            "description": "<p>Make an attack against a Vulnerable target within Far range. On a success, <strong>mark a Stress</strong> to deal <strong>3d4+8</strong> physical damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -327,7 +328,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
diff --git a/src/packs/adversaries/adversary_Skeleton_Dredge_6l1a3Fazq8BoKIcc.json b/src/packs/adversaries/adversary_Skeleton_Dredge_6l1a3Fazq8BoKIcc.json
index 22d00f72..5a973b17 100644
--- a/src/packs/adversaries/adversary_Skeleton_Dredge_6l1a3Fazq8BoKIcc.json
+++ b/src/packs/adversaries/adversary_Skeleton_Dredge_6l1a3Fazq8BoKIcc.json
@@ -104,7 +104,8 @@
       "source": "Daggerheart SRD",
       "page": 81,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "6l1a3Fazq8BoKIcc",
@@ -215,7 +216,7 @@
       "_id": "g9GQ9cMPNETxKXOz",
       "img": "icons/magic/symbols/runes-carved-stone-yellow.webp",
       "system": {
-        "description": "<p>The Dredge is defeated when they take any damage. For every 4 damage a PC deals to the Dredge, defeat an additional Minion within range the attack would succeed against.</p>",
+        "description": "<p>The @Lookup[@name] is defeated when they take any damage. For every 4 damage a PC deals to the @Lookup[@name], defeat an additional Minion within range the attack would succeed against.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -241,14 +242,14 @@
       "_id": "wl9KKEpVWDBu62hU",
       "img": "icons/creatures/abilities/tail-strike-bone-orange.webp",
       "system": {
-        "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all Dredges within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 1 physical damage each. Combine this damage.</p>",
+        "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all @Lookup[@name]s within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 1 physical damage each. Combine this damage.</p>",
         "resource": null,
         "actions": {
           "Sz55uB8xkoNytLwJ": {
             "type": "effect",
             "_id": "Sz55uB8xkoNytLwJ",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all Dredges within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 1 physical damage each. Combine this damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -276,7 +277,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
diff --git a/src/packs/adversaries/adversary_Skeleton_Knight_Q9LaVTyXF9NF12C7.json b/src/packs/adversaries/adversary_Skeleton_Knight_Q9LaVTyXF9NF12C7.json
index c16d878b..3c26dd28 100644
--- a/src/packs/adversaries/adversary_Skeleton_Knight_Q9LaVTyXF9NF12C7.json
+++ b/src/packs/adversaries/adversary_Skeleton_Knight_Q9LaVTyXF9NF12C7.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 82,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "Q9LaVTyXF9NF12C7",
@@ -222,14 +223,14 @@
       "_id": "OZKEz4eK9h7zCbuf",
       "img": "icons/magic/death/skull-energy-light-purple.webp",
       "system": {
-        "description": "<p>When the Knight makes a successful attack, all PCs within Close range lose a Hope and you gain a Fear.</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack, all PCs within Close range lose a Hope and you gain a Fear.</p>",
         "resource": null,
         "actions": {
           "9EiPNrGzwLtuf9g0": {
             "type": "damage",
             "_id": "9EiPNrGzwLtuf9g0",
             "systemPath": "actions",
-            "description": "<p>When the Knight makes a successful attack, all PCs within Close range lose a Hope and you gain a Fear.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -301,14 +302,14 @@
       "_id": "WdVLwy9RNkVlZnCL",
       "img": "icons/skills/melee/strike-sword-steel-yellow.webp",
       "system": {
-        "description": "<p><strong>Mark a Stress</strong> to make an attack against all targets within Very Close range. Targets the Knight succeeds against take <strong>1d8+2</strong> physical damage and must mark a Stress.</p><p>@Template[type:emanation|range:vc]</p>",
+        "description": "<p><strong>Mark a Stress</strong> to make an attack against all targets within Very Close range. Targets the @Lookup[@name] succeeds against take <strong>1d8+2</strong> physical damage and must mark a Stress.</p><p>@Template[type:emanation|range:vc]</p>",
         "resource": null,
         "actions": {
           "vMv4monku9LOSxUZ": {
             "type": "attack",
             "_id": "vMv4monku9LOSxUZ",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to make an attack against all targets within Very Close range. Targets the Knight succeeds against take <strong>1d8+2</strong> physical damage and must mark a Stress.</p><p>@Template[type:emanation|range:vc]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -412,7 +413,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
@@ -433,14 +435,14 @@
       "_id": "STesKV2KB61PlwCh",
       "img": "icons/magic/death/hand-undead-skeleton-fire-pink.webp",
       "system": {
-        "description": "<p>When the Knight is defeated, they make an attack against a target within Very Close range (prioritizing the creature who killed them). On a success, the target takes <strong>1d4+8</strong> physical damage and loses <strong>1d4</strong> Hope.</p>",
+        "description": "<p>When the @Lookup[@name] is defeated, they make an attack against a target within Very Close range (prioritizing the creature who killed them). On a success, the target takes <strong>1d4+8</strong> physical damage and loses <strong>1d4</strong> Hope.</p>",
         "resource": null,
         "actions": {
           "NtGhAVVOJF6ZGBRv": {
             "type": "attack",
             "_id": "NtGhAVVOJF6ZGBRv",
             "systemPath": "actions",
-            "description": "<p>When the Knight is defeated, they make an attack against a target within Very Close range (prioritizing the creature who killed them). On a success, the target takes <strong>1d4+8</strong> physical damage and loses <strong>1d4</strong> Hope.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -512,7 +514,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "effects": [],
       "folder": null,
diff --git a/src/packs/adversaries/adversary_Skeleton_Warrior_10YIQl0lvCJXZLfX.json b/src/packs/adversaries/adversary_Skeleton_Warrior_10YIQl0lvCJXZLfX.json
index 1a1ca906..28003d5c 100644
--- a/src/packs/adversaries/adversary_Skeleton_Warrior_10YIQl0lvCJXZLfX.json
+++ b/src/packs/adversaries/adversary_Skeleton_Warrior_10YIQl0lvCJXZLfX.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 82,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "10YIQl0lvCJXZLfX",
@@ -222,7 +223,7 @@
       "_id": "ouvJweENF1kLYcOT",
       "img": "icons/magic/death/bones-crossed-orange.webp",
       "system": {
-        "description": "<p>The Warrior is resistant to physical damage.</p>",
+        "description": "<p>The @Lookup[@name] is resistant to physical damage.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -292,7 +293,7 @@
       "_id": "hYl31ThCmZdc0MFa",
       "img": "icons/magic/death/hand-dirt-undead-zombie.webp",
       "system": {
-        "description": "<p>When the Warrior is defeated, you can spotlight them and roll a <strong>d6</strong>. On a result of 6, if there are other adversaries on the battlefi eld, the Warrior re-forms with no marked HP.</p>",
+        "description": "<p>When the @Lookup[@name] is defeated, you can spotlight them and roll a <strong>d6</strong>. On a result of 6, if there are other adversaries on the battlefield, the @Lookup[@name] re-forms with no marked HP.</p>",
         "resource": null,
         "actions": {
           "QnuFrptj8oARaA3i": {
@@ -344,7 +345,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "effects": [],
       "folder": null,
diff --git a/src/packs/adversaries/adversary_Spectral_Archer_5tCkhnBByUIN5UdG.json b/src/packs/adversaries/adversary_Spectral_Archer_5tCkhnBByUIN5UdG.json
index 9832d7ce..e6cc30f7 100644
--- a/src/packs/adversaries/adversary_Spectral_Archer_5tCkhnBByUIN5UdG.json
+++ b/src/packs/adversaries/adversary_Spectral_Archer_5tCkhnBByUIN5UdG.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 90,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "5tCkhnBByUIN5UdG",
@@ -226,7 +227,7 @@
       "name": "Ghost",
       "type": "feature",
       "system": {
-        "description": "<p>The Archer has resistance to physical damage. <strong>Mark a Stress</strong> to move up to Close range through solid objects.</p>",
+        "description": "<p>The @Lookup[@name] has resistance to physical damage. <strong>Mark a Stress</strong> to move up to Close range through solid objects.</p>",
         "resource": null,
         "actions": {
           "kkKfo1gwetxB3tFQ": {
@@ -332,7 +333,7 @@
             "type": "attack",
             "_id": "KahJnM94QQfy6oMK",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to make an attack within Far range against a PC who is within Very Close range of at least two other PCs. On a success, the target takes <strong>2d8+12</strong> physical damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -403,7 +404,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "0h4IVmCgWXyQngAw",
       "img": "icons/skills/targeting/crosshair-triple-strike-orange.webp",
diff --git a/src/packs/adversaries/adversary_Spectral_Captain_65cSO3EQEh6ZH6Xk.json b/src/packs/adversaries/adversary_Spectral_Captain_65cSO3EQEh6ZH6Xk.json
index 3cb0a37c..b70a5d53 100644
--- a/src/packs/adversaries/adversary_Spectral_Captain_65cSO3EQEh6ZH6Xk.json
+++ b/src/packs/adversaries/adversary_Spectral_Captain_65cSO3EQEh6ZH6Xk.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 90,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "65cSO3EQEh6ZH6Xk",
@@ -226,7 +227,7 @@
       "name": "Ghost",
       "type": "feature",
       "system": {
-        "description": "<p>The Captain has resistance to physical damage. <strong>Mark a Stress</strong> to move up to Close range through solid objects.</p>",
+        "description": "<p>The @Lookup[@name] has resistance to physical damage. <strong>Mark a Stress</strong> to move up to Close range through solid objects.</p>",
         "resource": null,
         "actions": {
           "k7RuXErgCsEBmhmk": {
@@ -332,7 +333,7 @@
             "type": "effect",
             "_id": "eHmbN4aPLUuEoDQt",
             "systemPath": "actions",
-            "description": "<p><strong>Spend 2 Fear</strong> to return up to [[/r 1d4+1]] defeated Spectral allies to the battle at the points where they first appeared (with no marked HP or Stress).</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -359,7 +360,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "7YVe4DfEWMNLXNvu",
       "img": "icons/magic/death/undead-skeleton-worn-blue.webp",
@@ -380,14 +382,14 @@
       "name": "Hold Fast",
       "type": "feature",
       "system": {
-        "description": "<p>When the Captain’s Spectral allies are forced to make a reaction roll, you can <strong>mark a Stress</strong> to give those allies a +2 bonus to the roll.</p>",
+        "description": "<p>When the @Lookup[@name]’s Spectral allies are forced to make a reaction roll, you can <strong>mark a Stress</strong> to give those allies a +2 bonus to the roll.</p>",
         "resource": null,
         "actions": {
           "aRg1bcPGUn69GPyB": {
             "type": "effect",
             "_id": "aRg1bcPGUn69GPyB",
             "systemPath": "actions",
-            "description": "<p>When the Captain’s Spectral allies are forced to make a reaction roll, you can <strong>mark a Stress</strong> to give those allies a +2 bonus to the roll.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -414,7 +416,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "X0vtV30ACVVZ6NfF",
       "img": "icons/magic/defensive/shield-barrier-flaming-diamond-teal.webp",
@@ -435,14 +438,14 @@
       "name": "Momentum",
       "type": "feature",
       "system": {
-        "description": "<p>When the Captain makes a successful attack against a PC, you gain a Fear.</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack against a PC, you gain a Fear.</p>",
         "resource": null,
         "actions": {
           "tZKpqKdehnPxRsOc": {
             "type": "healing",
             "_id": "tZKpqKdehnPxRsOc",
             "systemPath": "actions",
-            "description": "<p>When the Captain makes a successful attack against a PC, you gain a Fear.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "reaction",
             "cost": [],
@@ -509,7 +512,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "b9wn9oVMne8E1OYx",
       "img": "icons/skills/melee/strike-weapons-orange.webp",
diff --git a/src/packs/adversaries/adversary_Spectral_Guardian_UFVGl1osOsJTneLf.json b/src/packs/adversaries/adversary_Spectral_Guardian_UFVGl1osOsJTneLf.json
index 04062b0d..577a7d25 100644
--- a/src/packs/adversaries/adversary_Spectral_Guardian_UFVGl1osOsJTneLf.json
+++ b/src/packs/adversaries/adversary_Spectral_Guardian_UFVGl1osOsJTneLf.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 90,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "UFVGl1osOsJTneLf",
@@ -226,7 +227,7 @@
       "name": "Ghost",
       "type": "feature",
       "system": {
-        "description": "<p>The Guardian has resistance to physical damage. <strong>Mark a Stress</strong> to move up to Close range through solid objects.</p>",
+        "description": "<p>The @Lookup[@name] has resistance to physical damage. <strong>Mark a Stress</strong> to move up to Close range through solid objects.</p>",
         "resource": null,
         "actions": {
           "X1JlwWqyYHjahbpA": {
@@ -332,7 +333,7 @@
             "type": "attack",
             "_id": "AdfULyYsj9YPcCj6",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to make an attack against a target within Very Close range. On a success, deal <strong>2d10+6</strong> physical damage and the target must mark a Stress.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -435,7 +436,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "L48tQmj5O3s2pjBn",
       "img": "icons/weapons/swords/sword-flanged-lightning.webp",
diff --git a/src/packs/adversaries/adversary_Spellblade_ldbWEL7uZs84vyrR.json b/src/packs/adversaries/adversary_Spellblade_ldbWEL7uZs84vyrR.json
index f096aeef..13d6ed84 100644
--- a/src/packs/adversaries/adversary_Spellblade_ldbWEL7uZs84vyrR.json
+++ b/src/packs/adversaries/adversary_Spellblade_ldbWEL7uZs84vyrR.json
@@ -118,7 +118,8 @@
       "source": "Daggerheart SRD",
       "page": 82,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "ldbWEL7uZs84vyrR",
@@ -229,7 +230,7 @@
       "_id": "BwuoAv3EWT0m1apk",
       "img": "icons/weapons/swords/sword-runed-glowing.webp",
       "system": {
-        "description": "<p>Damage dealt by the Spellblade’s standard attack is considered both physical and magic.</p>",
+        "description": "<p>Damage dealt by the @Lookup[@name]’s standard attack is considered both physical and magic.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -262,7 +263,7 @@
             "type": "attack",
             "_id": "K4VnxigKTiu7hhZx",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> and target a group within Far range. All targets must succeed on an Agility Reaction Roll or take <strong>1d8+2</strong> magic damage. You gain a Fear for each target who marked HP from this attack.</p><p>@Template[type:emanation|range:f]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -341,7 +342,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
@@ -362,14 +364,14 @@
       "_id": "piyJhdHzztabmZ8I",
       "img": "icons/skills/movement/arrows-up-trio-red.webp",
       "system": {
-        "description": "<p><strong>Spend 2 Fear</strong> to spotlight up to fi ve allies within Far range.</p>",
+        "description": "<p><strong>Spend 2 Fear</strong> to spotlight up to five allies within Far range.</p>",
         "resource": null,
         "actions": {
           "N42NPEu7fcVDXEvl": {
             "type": "effect",
             "_id": "N42NPEu7fcVDXEvl",
             "systemPath": "actions",
-            "description": "<p><strong>Spend 2 Fear</strong> to spotlight up to fi ve allies within Far range.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -397,7 +399,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
@@ -418,14 +421,14 @@
       "_id": "P9nD5K2ztkZGo2I8",
       "img": "icons/skills/melee/strike-weapons-orange.webp",
       "system": {
-        "description": "<p>When the Spellblade makes a successful attack against a PC, you gain a Fear.</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack against a PC, you gain a Fear.</p>",
         "resource": null,
         "actions": {
           "f4AulN6MeMaEvqbk": {
             "type": "healing",
             "_id": "f4AulN6MeMaEvqbk",
             "systemPath": "actions",
-            "description": "<p>When the Spellblade makes a successful attack against a PC, you gain a Fear.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "reaction",
             "cost": [],
@@ -493,7 +496,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "effects": [],
       "folder": null,
diff --git a/src/packs/adversaries/adversary_Spy_8zlynOhnVA59KpKT.json b/src/packs/adversaries/adversary_Spy_8zlynOhnVA59KpKT.json
index 88f8eb5b..5affdc44 100644
--- a/src/packs/adversaries/adversary_Spy_8zlynOhnVA59KpKT.json
+++ b/src/packs/adversaries/adversary_Spy_8zlynOhnVA59KpKT.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 90,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "8zlynOhnVA59KpKT",
@@ -226,14 +227,14 @@
       "name": "Gathering Secrets",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Spend a Fear</strong> to describe how the Spy knows a secret about a PC in the scene.</p>",
+        "description": "<p><strong>Spend a Fear</strong> to describe how the @Lookup[@name] knows a secret about a PC in the scene.</p>",
         "resource": null,
         "actions": {
           "iq5KzP5hgA4377fO": {
             "type": "effect",
             "_id": "iq5KzP5hgA4377fO",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to describe how the Spy knows a secret about a PC in the scene.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -260,7 +261,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "csCWQuSqic5ckHeO",
       "img": "icons/magic/perception/orb-eye-scrying.webp",
@@ -281,14 +283,14 @@
       "name": "Fly on the Wall",
       "type": "feature",
       "system": {
-        "description": "<p>When a PC or group is discussing something sensitive, you can <strong>mark a Stress</strong> to reveal that the Spy is present in the scene, observing them. If the Spy escapes the scene to report their findings, you gain <strong>1d4</strong> Fear.</p>",
+        "description": "<p>When a PC or group is discussing something sensitive, you can <strong>mark a Stress</strong> to reveal that the @Lookup[@name] is present in the scene, observing them. If the @Lookup[@name] escapes the scene to report their findings, you gain <strong>1d4</strong> Fear.</p>",
         "resource": null,
         "actions": {
           "Ml8nt7SPNFc2iQno": {
             "type": "effect",
             "_id": "Ml8nt7SPNFc2iQno",
             "systemPath": "actions",
-            "description": "<p>When a PC or group is discussing something sensitive, you can <strong>mark a Stress</strong> to reveal that the Spy is present in the scene, observing them. If the Spy escapes the scene to report their findings, you gain <strong>1d4</strong> Fear.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -317,7 +319,7 @@
             "type": "healing",
             "_id": "qCA2hTMIYGW0FhGy",
             "systemPath": "actions",
-            "description": "<p>If the Spy escapes the scene to report their findings, you gain <strong>1d4</strong> Fear.</p>",
+            "description": "<p>If the @Lookup[@name] escapes the scene to report their findings, you gain <strong>1d4</strong> Fear.</p>",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -381,7 +383,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "UvgVDn0YjISLdKE4",
       "img": "icons/magic/perception/silhouette-stealth-shadow.webp",
diff --git a/src/packs/adversaries/adversary_Stag_Knight_KGVwnLq85ywP9xvB.json b/src/packs/adversaries/adversary_Stag_Knight_KGVwnLq85ywP9xvB.json
index 0f6fbc5f..603182cc 100644
--- a/src/packs/adversaries/adversary_Stag_Knight_KGVwnLq85ywP9xvB.json
+++ b/src/packs/adversaries/adversary_Stag_Knight_KGVwnLq85ywP9xvB.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 94,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "KGVwnLq85ywP9xvB",
@@ -226,14 +227,14 @@
       "name": "From Above",
       "type": "feature",
       "system": {
-        "description": "<p>When the Knight succeeds on a standard attack from above a target, they deal <strong>3d12+3</strong> physical damage instead of their standard damage.</p>",
+        "description": "<p>When the @Lookup[@name] succeeds on a standard attack from above a target, they deal <strong>3d12+3</strong> physical damage instead of their standard damage.</p>",
         "resource": null,
         "actions": {
           "PZNJgyomR7MK2xUP": {
             "type": "damage",
             "_id": "PZNJgyomR7MK2xUP",
             "systemPath": "actions",
-            "description": "<p>When the Knight succeeds on a standard attack from above a target, they deal <strong>3d12+3</strong> physical damage instead of their standard damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -305,14 +306,14 @@
       "name": "Blade of the Forest",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Spend a Fear</strong> to make an attack against all targets within Very Close range. Targets the Knight succeeds against take physical damage equal to <strong>[[/r 3d4]]</strong> + the target’s Major threshold.</p><p>@Template[type:emanation|range:vc]</p>",
+        "description": "<p><strong>Spend a Fear</strong> to make an attack against all targets within Very Close range. Targets the @Lookup[@name] succeeds against take physical damage equal to <strong>[[/r 3d4]]</strong> + the target’s Major threshold.</p><p>@Template[type:emanation|range:vc]</p>",
         "resource": null,
         "actions": {
           "xPSVwVVOC5gc2KTi": {
             "type": "attack",
             "_id": "xPSVwVVOC5gc2KTi",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to make an attack against all targets within Very Close range. Targets the Knight succeeds against take physical damage equal to <strong>[[/r 3d4]]</strong> + the target’s Major threshold.</p><p>@Template[type:emanation|range:vc]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -363,7 +364,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "CYaSykD9BUxpiOxg",
       "img": "icons/skills/melee/strike-blade-hooked-green-purple.webp",
@@ -384,14 +386,14 @@
       "name": "Thorny Armor",
       "type": "feature",
       "system": {
-        "description": "<p>When the Knight takes damage from an attack within Melee range, you can <strong>mark a Stress</strong> to deal <strong>1d10+5</strong> physical damage to the attacker.</p>",
+        "description": "<p>When the @Lookup[@name] takes damage from an attack within Melee range, you can <strong>mark a Stress</strong> to deal <strong>1d10+5</strong> physical damage to the attacker.</p>",
         "resource": null,
         "actions": {
           "b5KO7xpWspZS0swK": {
             "type": "damage",
             "_id": "b5KO7xpWspZS0swK",
             "systemPath": "actions",
-            "description": "<p>When the Knight takes damage from an attack within Melee range, you can <strong>mark a Stress</strong> to deal <strong>1d10+5</strong> physical damage to the attacker.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -447,7 +449,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "1LHHdn4ToSwSznuP",
       "img": "icons/magic/nature/root-vine-barrier-wall-brown.webp",
diff --git a/src/packs/adversaries/adversary_Stonewraith_3aAS2Qm3R6cgaYfE.json b/src/packs/adversaries/adversary_Stonewraith_3aAS2Qm3R6cgaYfE.json
index 6572d058..de3ef9f2 100644
--- a/src/packs/adversaries/adversary_Stonewraith_3aAS2Qm3R6cgaYfE.json
+++ b/src/packs/adversaries/adversary_Stonewraith_3aAS2Qm3R6cgaYfE.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 91,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "3aAS2Qm3R6cgaYfE",
@@ -226,7 +227,7 @@
       "name": "Stonestrider",
       "type": "feature",
       "system": {
-        "description": "<p>The Stonewraith can move through stone and earth as easily as air. While within stone or earth, they are Hidden and immune to all damage.</p>",
+        "description": "<p>The @Lookup[@name] can move through stone and earth as easily as air. While within stone or earth, they are Hidden and immune to all damage.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -258,7 +259,7 @@
             "type": "attack",
             "_id": "E8C2Nd4mwcGTXoXb",
             "systemPath": "actions",
-            "description": "<p>While <em>Hidden</em>, <strong>mark a Stress</strong> to leap into Melee range with a target within Very Close range. The target must succeed on an Agility or Instinct Reaction Roll (15) or take <strong>2d8</strong> physical damage and become temporarily Restrained.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -339,7 +340,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "tQgxiSS48TJ3X1Dl",
       "img": "icons/creatures/abilities/mouth-teeth-rows-white.webp",
@@ -406,7 +408,7 @@
             "type": "attack",
             "_id": "4UGEEuK9XY8leCBV",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to roar while within a cave and cause a cave-in. All targets within Close range must succeed on an Agility Reaction Roll (14) or take <strong>2d10</strong> physical damage. The rubble can be cleared with a Progress Countdown (8).</p><p>@Template[type:emanation|range:c]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -521,7 +523,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "9Z0i0uURfBMVIapJ",
       "img": "icons/magic/sonic/projectile-sound-rings-wave.webp",
@@ -542,14 +545,14 @@
       "name": "Momentum",
       "type": "feature",
       "system": {
-        "description": "<p>When the Stonewraith makes a successful attack against a PC, you gain a Fear.</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack against a PC, you gain a Fear.</p>",
         "resource": null,
         "actions": {
           "IIZPctjF4MJkWs4b": {
             "type": "healing",
             "_id": "IIZPctjF4MJkWs4b",
             "systemPath": "actions",
-            "description": "<p>When the Stonewraith makes a successful attack against a PC, you gain a Fear.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "reaction",
             "cost": [],
@@ -616,7 +619,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "faM1UzclP0X3ZrkJ",
       "img": "icons/skills/melee/strike-weapons-orange.webp",
diff --git a/src/packs/adversaries/adversary_Swarm_of_Rats_qNgs3AbLyJrY19nt.json b/src/packs/adversaries/adversary_Swarm_of_Rats_qNgs3AbLyJrY19nt.json
index 1db0df10..33fe06d7 100644
--- a/src/packs/adversaries/adversary_Swarm_of_Rats_qNgs3AbLyJrY19nt.json
+++ b/src/packs/adversaries/adversary_Swarm_of_Rats_qNgs3AbLyJrY19nt.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 82,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "qNgs3AbLyJrY19nt",
@@ -222,7 +223,7 @@
       "_id": "9Zuu892SO5NmtI4w",
       "img": "icons/creatures/magical/humanoid-silhouette-aliens-green.webp",
       "system": {
-        "description": "<p>When the Swarm has marked half or more of their HP, their standard attack deals <strong>1d4+1</strong> physical damage instead.</p>",
+        "description": "<p>When the @Lookup[@name] has marked half or more of their HP, their standard attack deals <strong>1d4+1</strong> physical damage instead.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -248,7 +249,7 @@
       "_id": "0O6ckwZE34RBnjpB",
       "img": "icons/creatures/mammals/rodent-rat-green.webp",
       "system": {
-        "description": "<p>All targets within Melee range have disadvantage on attacks against targets other than the Swarm.</p>",
+        "description": "<p>All targets within Melee range have disadvantage on attacks against targets other than the @Lookup[@name].</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
diff --git a/src/packs/adversaries/adversary_Sylvan_Soldier_VtFBt9XBE0WrGGxP.json b/src/packs/adversaries/adversary_Sylvan_Soldier_VtFBt9XBE0WrGGxP.json
index bcaf166a..2ec5e924 100644
--- a/src/packs/adversaries/adversary_Sylvan_Soldier_VtFBt9XBE0WrGGxP.json
+++ b/src/packs/adversaries/adversary_Sylvan_Soldier_VtFBt9XBE0WrGGxP.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 82,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "VtFBt9XBE0WrGGxP",
@@ -228,14 +229,14 @@
       "_id": "uo5DbPuQQ018Pyfd",
       "img": "icons/creatures/abilities/wolf-howl-moon-purple.webp",
       "system": {
-        "description": "<p>If the Soldier makes a standard attack and another Sylvan Soldier is within Melee range of the target, deal <strong>1d8+5</strong> physical damage instead of their standard damage.</p>",
+        "description": "<p>If the @Lookup[@name] makes a standard attack and another @Lookup[@name] is within Melee range of the target, deal <strong>1d8+5</strong> physical damage instead of their standard damage.</p>",
         "resource": null,
         "actions": {
           "dmlz83o2JOAoGiuK": {
             "type": "attack",
             "_id": "dmlz83o2JOAoGiuK",
             "systemPath": "actions",
-            "description": "<p>If the Soldier makes a standard attack and another Sylvan Soldier is within Melee range of the target, deal <strong>1d8+5</strong> physical damage instead of their standard damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -335,7 +336,7 @@
             "type": "attack",
             "_id": "UyL02IaAO3m8LgWI",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to pull down a tree within Close range. A creature hit by the tree must succeed on an Agility Reaction Roll (15) or take <strong>1d10</strong> physical damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -414,7 +415,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
@@ -435,14 +437,14 @@
       "_id": "1dmKoSnV82sLc8xZ",
       "img": "icons/magic/nature/root-vine-leaves-green.webp",
       "system": {
-        "description": "<p>When the Soldier makes a successful attack, you can <strong>mark a Stress</strong> to become Hidden until the Soldier’s next attack or a PC succeeds on an Instinct Roll (14) to find them.</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack, you can <strong>mark a Stress</strong> to become Hidden until the @Lookup[@name]’s next attack or a PC succeeds on an Instinct Roll (14) to find them.</p>",
         "resource": null,
         "actions": {
           "l32BjO9J0jFvD0Zy": {
             "type": "effect",
             "_id": "l32BjO9J0jFvD0Zy",
             "systemPath": "actions",
-            "description": "<p>When the Soldier makes a successful attack, you can <strong>mark a Stress</strong> to become Hidden until the Soldier’s next attack or a PC succeeds on an Instinct Roll (14) to find them.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -475,7 +477,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "effects": [
         {
diff --git a/src/packs/adversaries/adversary_Tangle_Bramble_Swarm_PKSXFuaIHUCoH63A.json b/src/packs/adversaries/adversary_Tangle_Bramble_Swarm_PKSXFuaIHUCoH63A.json
index 2a753812..639fa956 100644
--- a/src/packs/adversaries/adversary_Tangle_Bramble_Swarm_PKSXFuaIHUCoH63A.json
+++ b/src/packs/adversaries/adversary_Tangle_Bramble_Swarm_PKSXFuaIHUCoH63A.json
@@ -148,7 +148,8 @@
       "source": "Daggerheart SRD",
       "page": 82,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "ownership": {
@@ -258,7 +259,7 @@
       "_id": "4dSzqtYvH385r9Ng",
       "img": "icons/creatures/magical/humanoid-silhouette-aliens-green.webp",
       "system": {
-        "description": "<p>When the Swarm has marked half or more of their HP, their standard attack deals <strong>1d4+2</strong> physical damage instead.</p>",
+        "description": "<p>When the @Lookup[@name] has marked half or more of their HP, their standard attack deals <strong>1d4+2</strong> physical damage instead.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -291,7 +292,7 @@
             "type": "damage",
             "_id": "CiA4K6py0eW6eihU",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to deal <strong>2d6+8</strong> direct physical damage to a target with 3 or more bramble tokens.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -353,7 +354,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
@@ -374,14 +376,14 @@
       "_id": "JRSGc3ozDnKCAvCj",
       "img": "icons/magic/nature/root-vine-entangled-hands.webp",
       "system": {
-        "description": "<p>When the Swarm succeeds on an attack, give the target a bramble token. If a target has any bramble tokens, they are Restrained. If a target has 3 or more bramble tokens, they are also Vulnerable. All bramble tokens can be removed by succeeding on a Finesse Roll (12 + the number of bramble tokens) or dealing Major or greater damage to the Swarm. If bramble tokens are removed from a target using a Finesse Roll, a number of Tangle Bramble Minions spawn within Melee range equal to the number of tokens removed.</p>",
+        "description": "<p>When the @Lookup[@name] succeeds on an attack, give the target a bramble token. If a target has any bramble tokens, they are Restrained. If a target has 3 or more bramble tokens, they are also Vulnerable. All bramble tokens can be removed by succeeding on a Finesse Roll (12 + the number of bramble tokens) or dealing Major or greater damage to the Swarm. If bramble tokens are removed from a target using a Finesse Roll, a number of @Lookup[@name] Minions spawn within Melee range equal to the number of tokens removed.</p>",
         "resource": null,
         "actions": {
           "Cdw2XxA5NhAQhQse": {
             "type": "effect",
             "_id": "Cdw2XxA5NhAQhQse",
             "systemPath": "actions",
-            "description": "<p>When the Swarm succeeds on an attack, give the target a bramble token. If a target has any bramble tokens, they are Restrained. If a target has 3 or more bramble tokens, they are also Vulnerable. All bramble tokens can be removed by succeeding on a Finesse Roll (12 + the number of bramble tokens) or dealing Major or greater damage to the Swarm. If bramble tokens are removed from a target using a Finesse Roll, a number of Tangle Bramble Minions spawn within Melee range equal to the number of tokens removed.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -407,7 +409,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "effects": [
         {
diff --git a/src/packs/adversaries/adversary_Tangle_Bramble_XcAGOSmtCFLT1unN.json b/src/packs/adversaries/adversary_Tangle_Bramble_XcAGOSmtCFLT1unN.json
index 8b984fc1..a6e5ca17 100644
--- a/src/packs/adversaries/adversary_Tangle_Bramble_XcAGOSmtCFLT1unN.json
+++ b/src/packs/adversaries/adversary_Tangle_Bramble_XcAGOSmtCFLT1unN.json
@@ -144,7 +144,8 @@
       "source": "Daggerheart SRD",
       "page": 83,
       "artist": ""
-    }
+    },
+    "size": "tiny"
   },
   "flags": {},
   "ownership": {
@@ -254,7 +255,7 @@
       "_id": "jH1VMpj4dCUhKVCJ",
       "img": "icons/magic/symbols/runes-carved-stone-yellow.webp",
       "system": {
-        "description": "<p>The Bramble is defeated when they take any damage. For every 4 damage a PC deals to the Tangle Bramble, defeat an additional Minion within range the attack would succeed against.</p>",
+        "description": "<p>The @Lookup[@name] is defeated when they take any damage. For every 4 damage a PC deals to the @Lookup[@name], defeat an additional Minion within range the attack would succeed against.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -280,14 +281,14 @@
       "_id": "WiobzuyvJ46zfsOv",
       "img": "icons/creatures/abilities/tail-strike-bone-orange.webp",
       "system": {
-        "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all Tangle Brambles within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 2 physical damage each. Combine this damage.</p>",
+        "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all @Lookup[@name]s within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 2 physical damage each. Combine this damage.</p>",
         "resource": null,
         "actions": {
           "ZC5pKIb9N82vgMWu": {
             "type": "effect",
             "_id": "ZC5pKIb9N82vgMWu",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all Tangle Brambles within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 2 physical damage each. Combine this damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -315,7 +316,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
@@ -336,12 +338,13 @@
       "_id": "KBMf7oBfFSHoafKN",
       "img": "icons/magic/nature/root-vines-knot-brown.webp",
       "system": {
-        "description": "<p>When an attack from the Bramble causes a target to mark HP and there are three or more Tangle Bramble Minions within Close range, you can combine the Minions into a @UUID[Compendium.daggerheart.adversaries.Actor.PKSXFuaIHUCoH63A]{Tangle Bramble Swarm Horde}. The Horde’s HP is equal to the number of Minions combined.</p>",
+        "description": "<p>When an attack from the @Lookup[@name] causes a target to mark HP and there are three or more @Lookup[@name] Minions within Close range, you can combine the Minions into a @UUID[Compendium.daggerheart.adversaries.Actor.PKSXFuaIHUCoH63A]{Tangle Bramble Swarm Horde}. The Horde’s HP is equal to the number of Minions combined.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "effects": [],
       "folder": null,
diff --git a/src/packs/adversaries/adversary_Tiny_Green_Ooze_aLkLFuVoKz2NLoBK.json b/src/packs/adversaries/adversary_Tiny_Green_Ooze_aLkLFuVoKz2NLoBK.json
index 8864c47c..6a984b3c 100644
--- a/src/packs/adversaries/adversary_Tiny_Green_Ooze_aLkLFuVoKz2NLoBK.json
+++ b/src/packs/adversaries/adversary_Tiny_Green_Ooze_aLkLFuVoKz2NLoBK.json
@@ -107,7 +107,8 @@
       "source": "Daggerheart SRD",
       "page": 80,
       "artist": ""
-    }
+    },
+    "size": "tiny"
   },
   "flags": {},
   "_id": "aLkLFuVoKz2NLoBK",
@@ -218,14 +219,14 @@
       "_id": "WpOh5kHHx7lcTvEY",
       "img": "icons/magic/acid/dissolve-drip-droplet-smoke.webp",
       "system": {
-        "description": "<p>When the Ooze makes a successful attack, the target must mark an Armor Slot without receiving its benefi ts (they can still use armor to reduce the damage). If they can’t mark an Armor Slot, they must mark an additional HP.</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack, the target must mark an Armor Slot without receiving its benefi ts (they can still use armor to reduce the damage). If they can’t mark an Armor Slot, they must mark an additional HP.</p>",
         "resource": null,
         "actions": {
           "HfK0u0c7NRppuF1Q": {
             "type": "damage",
             "_id": "HfK0u0c7NRppuF1Q",
             "systemPath": "actions",
-            "description": "<p>When the Ooze makes a successful attack, the target must mark an Armor Slot without receiving its benefi ts (they can still use armor to reduce the damage). If they can’t mark an Armor Slot, they must mark an additional HP.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
diff --git a/src/packs/adversaries/adversary_Tiny_Red_Ooze_1fkLQXVtmILqfJ44.json b/src/packs/adversaries/adversary_Tiny_Red_Ooze_1fkLQXVtmILqfJ44.json
index f3ea25ff..116fffba 100644
--- a/src/packs/adversaries/adversary_Tiny_Red_Ooze_1fkLQXVtmILqfJ44.json
+++ b/src/packs/adversaries/adversary_Tiny_Red_Ooze_1fkLQXVtmILqfJ44.json
@@ -107,7 +107,8 @@
       "source": "Daggerheart SRD",
       "page": 80,
       "artist": ""
-    }
+    },
+    "size": "tiny"
   },
   "flags": {},
   "_id": "1fkLQXVtmILqfJ44",
@@ -218,7 +219,7 @@
       "_id": "zsUMP2qNmNpVHwk0",
       "img": "icons/magic/fire/blast-jet-stream-splash.webp",
       "system": {
-        "description": "<p>When a creature within Melee range deals damage to the Ooze, they take <strong>1d6</strong> direct magic damage.</p>",
+        "description": "<p>When a creature within Melee range deals damage to the @Lookup[@name], they take <strong>1d6</strong> direct magic damage.</p>",
         "resource": null,
         "actions": {
           "cHaEnBwinVKmoS9s": {
@@ -277,7 +278,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "effects": [],
       "folder": null,
diff --git a/src/packs/adversaries/adversary_Treant_Sapling_o63nS0k3wHu6EgKP.json b/src/packs/adversaries/adversary_Treant_Sapling_o63nS0k3wHu6EgKP.json
index e4e5f6f7..8959f78a 100644
--- a/src/packs/adversaries/adversary_Treant_Sapling_o63nS0k3wHu6EgKP.json
+++ b/src/packs/adversaries/adversary_Treant_Sapling_o63nS0k3wHu6EgKP.json
@@ -97,13 +97,15 @@
         ]
       },
       "type": "attack",
-      "chatDisplay": false
+      "chatDisplay": false,
+      "range": ""
     },
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 95,
       "artist": ""
-    }
+    },
+    "size": "small"
   },
   "flags": {},
   "_id": "o63nS0k3wHu6EgKP",
@@ -212,7 +214,7 @@
       "name": "Minion (6)",
       "type": "feature",
       "system": {
-        "description": "<p>The Sapling is defeated when they take any damage. For every 6 damage a PC deals to the Sapling, defeat an additional Minion within range the attack would succeed against.</p>",
+        "description": "<p>The @Lookup[@name] is defeated when they take any damage. For every 6 damage a PC deals to the @Lookup[@name], defeat an additional Minion within range the attack would succeed against.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -237,7 +239,7 @@
       "name": "Group Attack",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all Treant Saplings within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 8 physical damage each. Combine this damage.</p>",
+        "description": "<p><strong>Spend a Fear</strong> to choose a target and spotlight all @Lookup[@name]s within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal 8 physical damage each. Combine this damage.</p>",
         "resource": null,
         "actions": {
           "euP8VA4wvfsCpwN1": {
@@ -271,7 +273,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "fh8ehANkVOnxEKVa",
       "img": "icons/creatures/abilities/tail-strike-bone-orange.webp",
diff --git a/src/packs/adversaries/adversary_Vampire_WWyUp6Mxl1S3KYUG.json b/src/packs/adversaries/adversary_Vampire_WWyUp6Mxl1S3KYUG.json
index f2522a90..4f51cd79 100644
--- a/src/packs/adversaries/adversary_Vampire_WWyUp6Mxl1S3KYUG.json
+++ b/src/packs/adversaries/adversary_Vampire_WWyUp6Mxl1S3KYUG.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 95,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "WWyUp6Mxl1S3KYUG",
@@ -226,14 +227,14 @@
       "name": "Draining Bite",
       "type": "feature",
       "system": {
-        "description": "<p>Make an attack against a target within Melee range. On a success, deal <strong>5d4</strong> physical damage. A target who marks HP from this attack loses a Hope and must mark a Stress. The Vampire then clears a HP.</p>",
+        "description": "<p>Make an attack against a target within Melee range. On a success, deal <strong>5d4</strong> physical damage. A target who marks HP from this attack loses a Hope and must mark a Stress. The @Lookup[@name] then clears a HP.</p>",
         "resource": null,
         "actions": {
           "GxJ7oxrrFp7VsybV": {
             "type": "attack",
             "_id": "GxJ7oxrrFp7VsybV",
             "systemPath": "actions",
-            "description": "<p>Make an attack against a target within Melee range. On a success, deal <strong>5d4</strong> physical damage. A target who marks HP from this attack loses a Hope and must mark a Stress. The Vampire then clears a HP.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -352,7 +353,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "X0VgwJbK2n3mez0p",
       "img": "icons/creatures/abilities/fang-tooth-blood-red.webp",
@@ -373,14 +375,14 @@
       "name": "Mistform",
       "type": "feature",
       "system": {
-        "description": "<p>When the Vampire takes physical damage, you can <strong>spend a Fear</strong> to take half damage.</p>",
+        "description": "<p>When the @Lookup[@name] takes physical damage, you can <strong>spend a Fear</strong> to take half damage.</p>",
         "resource": null,
         "actions": {
           "TDu6DplfPluwInhi": {
             "type": "effect",
             "_id": "TDu6DplfPluwInhi",
             "systemPath": "actions",
-            "description": "<p>When the Vampire takes physical damage, you can <strong>spend a Fear</strong> to take half damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -407,7 +409,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "DKVB4rbX2M1CCVM7",
       "img": "icons/magic/air/fog-gas-smoke-blue-gray.webp",
diff --git a/src/packs/adversaries/adversary_Vault_Guardian_Gaoler_JqYraOqNmmhHk4Yy.json b/src/packs/adversaries/adversary_Vault_Guardian_Gaoler_JqYraOqNmmhHk4Yy.json
index 38cddad7..d1cca592 100644
--- a/src/packs/adversaries/adversary_Vault_Guardian_Gaoler_JqYraOqNmmhHk4Yy.json
+++ b/src/packs/adversaries/adversary_Vault_Guardian_Gaoler_JqYraOqNmmhHk4Yy.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 95,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "JqYraOqNmmhHk4Yy",
@@ -220,7 +221,7 @@
       "name": "Blocking Shield",
       "type": "feature",
       "system": {
-        "description": "<p>Creatures within Melee range of the Gaoler have disadvantage on attack rolls against them. Creatures trapped inside the Gaoler are immune to this feature.</p>",
+        "description": "<p>Creatures within Melee range of the @Lookup[@name] have disadvantage on attack rolls against them. Creatures trapped inside the @Lookup[@name] are immune to this feature.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -245,14 +246,14 @@
       "name": "Lock Up",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Mark a Stress</strong> to make an attack against a target within Very Close range. On a success, the target is <em>Restrained</em> within the Gaoler until freed with a successful Strength Roll (18). While <em>Restrained</em>, the target can only attack the Gaoler. </p>",
+        "description": "<p><strong>Mark a Stress</strong> to make an attack against a target within Very Close range. On a success, the target is <em>Restrained</em> within the @Lookup[@name] until freed with a successful Strength Roll (18). While <em>Restrained</em>, the target can only attack the @Lookup[@name].</p>",
         "resource": null,
         "actions": {
           "NawX2Kuk4GXI5loW": {
             "type": "attack",
             "_id": "NawX2Kuk4GXI5loW",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to make an attack against a target within Very Close range. On a success, the target is <em>Restrained</em> within the Gaoler until freed with a successful Strength Roll (18). While <em>Restrained</em>, the target can only attack the Gaoler. </p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -308,7 +309,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "VlHp8RjHy7MK8rqC",
       "img": "icons/environment/traps/cage-grey-steel.webp",
diff --git a/src/packs/adversaries/adversary_Vault_Guardian_Sentinel_FVgYb28fhxlVcGwA.json b/src/packs/adversaries/adversary_Vault_Guardian_Sentinel_FVgYb28fhxlVcGwA.json
index 10e023c1..67139669 100644
--- a/src/packs/adversaries/adversary_Vault_Guardian_Sentinel_FVgYb28fhxlVcGwA.json
+++ b/src/packs/adversaries/adversary_Vault_Guardian_Sentinel_FVgYb28fhxlVcGwA.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 96,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "FVgYb28fhxlVcGwA",
@@ -220,7 +221,7 @@
       "name": "Kinetic Slam",
       "type": "feature",
       "system": {
-        "description": "<p>Targets who take damage from the Sentinel’s standard attack are knocked back to Very Close range.</p>",
+        "description": "<p>Targets who take damage from the @Lookup[@name]’s standard attack are knocked back to Very Close range.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -245,14 +246,14 @@
       "name": "Box In",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Mark a Stress</strong> to choose a target within Very Close range to focus on. That target has disadvantage on attack rolls when they’re within Very Close range of the Sentinel. The Sentinel can only focus on one target at a time.</p>",
+        "description": "<p><strong>Mark a Stress</strong> to choose a target within Very Close range to focus on. That target has disadvantage on attack rolls when they’re within Very Close range of the @Lookup[@name]. The @Lookup[@name]Sentinel can only focus on one target at a time.</p>",
         "resource": null,
         "actions": {
           "4RQnBu4kcUs3PcPH": {
             "type": "effect",
             "_id": "4RQnBu4kcUs3PcPH",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to choose a target within Very Close range to focus on. That target has disadvantage on attack rolls when they’re within Very Close range of the Sentinel. The Sentinel can only focus on one target at a time.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -284,7 +285,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "DLspoIclNJcTB3YJ",
       "img": "icons/magic/perception/eye-ringed-glow-angry-red.webp",
@@ -356,7 +358,7 @@
             "type": "attack",
             "_id": "mI9i9iwrM48NjzeE",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to lob explosive magic at a point within Far range. All targets within Very Close range of that point must make an Agility Reaction Roll. Targets who fail take <strong>2d8+20</strong> magic damage and are knocked back to Close range. Targets who succeed take half damage and aren’t knocked back.</p><p>@Template[type:circle|range:vc]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -434,7 +436,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "LVFZ4AfVhS6Q9hRy",
       "img": "icons/magic/sonic/projectile-shock-wave-blue.webp",
@@ -455,14 +458,14 @@
       "name": "Momentum",
       "type": "feature",
       "system": {
-        "description": "<p>When the Sentinel makes a successful attack against a PC, you gain a Fear.</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack against a PC, you gain a Fear.</p>",
         "resource": null,
         "actions": {
           "AtXg38fItOgiYUee": {
             "type": "healing",
             "_id": "AtXg38fItOgiYUee",
             "systemPath": "actions",
-            "description": "<p>When the Sentinel makes a successful attack against a PC, you gain a Fear.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "reaction",
             "cost": [],
@@ -529,7 +532,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "N4446BxubUanUQHH",
       "img": "icons/skills/melee/strike-weapons-orange.webp",
diff --git a/src/packs/adversaries/adversary_Vault_Guardian_Turret_c5hGdvY5UnSjlHws.json b/src/packs/adversaries/adversary_Vault_Guardian_Turret_c5hGdvY5UnSjlHws.json
index 6b4671ea..ab683607 100644
--- a/src/packs/adversaries/adversary_Vault_Guardian_Turret_c5hGdvY5UnSjlHws.json
+++ b/src/packs/adversaries/adversary_Vault_Guardian_Turret_c5hGdvY5UnSjlHws.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 96,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "_id": "c5hGdvY5UnSjlHws",
@@ -220,7 +221,7 @@
       "name": "Slow Firing",
       "type": "feature",
       "system": {
-        "description": "<p>When you spotlight the Turret and they don’t have a token on their stat block, they can’t make a standard attack. Place a token on their stat block and describe what they’re preparing to do. When you spotlight the Turret and they have a token on their stat block, clear the token and they can attack.</p>",
+        "description": "<p>When you spotlight the @Lookup[@name] and they don’t have a token on their stat block, they can’t make a standard attack. Place a token on their stat block and describe what they’re preparing to do. When you spotlight the @Lookup[@name] and they have a token on their stat block, clear the token and they can attack.</p>",
         "resource": {
           "type": "simple",
           "value": 0,
@@ -250,14 +251,14 @@
       "name": "Mark Target",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Spend a Fear</strong> to Mark a target within Far range until the Turret is destroyed or the Marked target becomes Hidden. While the target is Marked, their Evasion is halved.</p>",
+        "description": "<p><strong>Spend a Fear</strong> to Mark a target within Far range until the @Lookup[@name] is destroyed or the Marked target becomes Hidden. While the target is Marked, their Evasion is halved.</p>",
         "resource": null,
         "actions": {
           "1SfYAIIr5znuHCKX": {
             "type": "effect",
             "_id": "1SfYAIIr5znuHCKX",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to Mark a target within Far range until the Turret is destroyed or the Marked target becomes Hidden. While the target is Marked, their Evasion is halved.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -289,7 +290,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "uwAr6wR4k7ppI2cW",
       "img": "icons/skills/targeting/crosshair-pointed-orange.webp",
@@ -354,14 +356,14 @@
       "name": "Concentrate Fire",
       "type": "feature",
       "system": {
-        "description": "<p>When another adversary deals damage to a target within Far range of the Turret, you can <strong>mark a Stress</strong> to add the Turret’s standard attack damage to the damage roll.</p>",
+        "description": "<p>When another adversary deals damage to a target within Far range of the @Lookup[@name], you can <strong>mark a Stress</strong> to add the @Lookup[@name]’s standard attack damage to the damage roll.</p>",
         "resource": null,
         "actions": {
           "3cqPKBRtwxtLwDpN": {
             "type": "effect",
             "_id": "3cqPKBRtwxtLwDpN",
             "systemPath": "actions",
-            "description": "<p>When another adversary deals damage to a target within Far range of the Turret, you can <strong>mark a Stress</strong> to add the Turret’s standard attack damage to the damage roll.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -388,7 +390,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "G7qZ9RHPyNns3axX",
       "img": "icons/commodities/tech/cog-brass.webp",
@@ -409,14 +412,14 @@
       "name": "Detonation",
       "type": "feature",
       "system": {
-        "description": "<p>When the Turret is destroyed, they explode. All targets within Close range must make an Agility Reaction Roll. Targets who fail take <strong>3d20</strong> physical damage. Targets who succeed take half damage.</p><p>@Template[type:emanation|range:c]</p>",
+        "description": "<p>When the @Lookup[@name] is destroyed, they explode. All targets within Close range must make an Agility Reaction Roll. Targets who fail take <strong>3d20</strong> physical damage. Targets who succeed take half damage.</p><p>@Template[type:emanation|range:c]</p>",
         "resource": null,
         "actions": {
           "i1PZ9ddYdOOs2xSb": {
             "type": "attack",
             "_id": "i1PZ9ddYdOOs2xSb",
             "systemPath": "actions",
-            "description": "<p>When the Turret is destroyed, they explode. All targets within Close range must make an Agility Reaction Roll. Targets who fail take <strong>3d20</strong> physical damage. Targets who succeed take half damage.</p><p>@Template[type:emanation|range:c]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -487,7 +490,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "ALDtQci3ktq9cajU",
       "img": "icons/magic/sonic/explosion-shock-wave-teal.webp",
diff --git a/src/packs/adversaries/adversary_Volcanic_Dragon__Ashen_Tyrant_pMuXGCSOQaxpi5tb.json b/src/packs/adversaries/adversary_Volcanic_Dragon__Ashen_Tyrant_pMuXGCSOQaxpi5tb.json
index 3bcdd49a..82bdd810 100644
--- a/src/packs/adversaries/adversary_Volcanic_Dragon__Ashen_Tyrant_pMuXGCSOQaxpi5tb.json
+++ b/src/packs/adversaries/adversary_Volcanic_Dragon__Ashen_Tyrant_pMuXGCSOQaxpi5tb.json
@@ -150,7 +150,8 @@
       "source": "Daggerheart SRD",
       "page": 101,
       "artist": ""
-    }
+    },
+    "size": "gargantuan"
   },
   "prototypeToken": {
     "name": "Volcanic Dragon: Ashen Tyrant",
@@ -251,14 +252,14 @@
       "name": "Relentless (4)",
       "type": "feature",
       "system": {
-        "description": "<p>The Ashen Tyrant can be spotlighted up to four times per GM turn. Spend Fear as usual to spotlight them.</p>",
+        "description": "<p>The @Lookup[@name] can be spotlighted up to four times per GM turn. Spend Fear as usual to spotlight them.</p>",
         "resource": null,
         "actions": {
           "cvhKUhLycuEeloKH": {
             "type": "effect",
             "_id": "cvhKUhLycuEeloKH",
             "systemPath": "actions",
-            "description": "<p>The Ashen Tyrant can be spotlighted up to four times per GM turn. Spend Fear as usual to spotlight them.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "passive",
             "cost": [
@@ -309,7 +310,7 @@
       "name": "Cornered",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Mark a Stress</strong> instead of spending a Fear to spotlight the Ashen Tyrant.</p>",
+        "description": "<p><strong>Mark a Stress</strong> instead of spending a Fear to spotlight the @Lookup[@name].</p>",
         "resource": null,
         "actions": {
           "nIBoqkOFWx0vpbnj": {
@@ -364,7 +365,7 @@
       "name": "Injured Wings",
       "type": "feature",
       "system": {
-        "description": "<p>While flying, the Ashen Tyrant gains a +1 bonus to their Difficulty.</p>",
+        "description": "<p>While flying, the @Lookup[@name] gains a +1 bonus to their Difficulty.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -433,14 +434,14 @@
       "name": "Ashes to Ashes",
       "type": "feature",
       "system": {
-        "description": "<p>When a PC rolls a failure while within Close range of the Ashen Tyrant, they lose a Hope and you gain a Fear. If the PC can’t lose a Hope, they must mark a HP.</p>",
+        "description": "<p>When a PC rolls a failure while within Close range of the @Lookup[@name], they lose a Hope and you gain a Fear. If the PC can’t lose a Hope, they must mark a HP.</p>",
         "resource": null,
         "actions": {
           "q6gbeIrGMII6IeiM": {
             "type": "damage",
             "_id": "q6gbeIrGMII6IeiM",
             "systemPath": "actions",
-            "description": "<p>When a PC rolls a failure while within Close range of the Ashen Tyrant, they lose a Hope and you gain a Fear. If the PC can’t lose a Hope, they must mark a HP.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -511,14 +512,14 @@
       "name": "Desperate Rampage",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Mark a Stress</strong> to make an attack against all targets within Close range. Targets the Ashen Tyrant succeeds against take <strong>2d20+2</strong> physical damage, are knocked back to Close range of where they were, and must mark a Stress.</p><p>@Template[type:emanation|range:c]</p>",
+        "description": "<p><strong>Mark a Stress</strong> to make an attack against all targets within Close range. Targets the @Lookup[@name] succeeds against take <strong>2d20+2</strong> physical damage, are knocked back to Close range of where they were, and must mark a Stress.</p><p>@Template[type:emanation|range:c]</p>",
         "resource": null,
         "actions": {
           "3glUQAcsLBcCumnS": {
             "type": "attack",
             "_id": "3glUQAcsLBcCumnS",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to make an attack against all targets within Close range. Targets the Ashen Tyrant succeeds against take <strong>2d20+2</strong> physical damage, are knocked back to Close range of where they were, and must mark a Stress.</p><p>@Template[type:emanation|range:c]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -614,7 +615,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "AXhSVGL33i0j6DAw",
       "img": "icons/creatures/abilities/tail-swipe-green.webp",
@@ -642,7 +644,7 @@
             "type": "effect",
             "_id": "UrD4A68IBJgyfvvt",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to smash the ground and kick up ash within Far range. While within the ash cloud, a target has disadvantage on action rolls. The ash cloud clears the next time an adversary is spotlighted.</p><p>@Template[type:emanation|range:f]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -669,7 +671,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "ggCol5LQ2ZpeQjly",
       "img": "icons/magic/air/fog-gas-smoke-brown.webp",
@@ -690,14 +693,14 @@
       "name": "Apocalyptic Thrasing",
       "type": "feature",
       "system": {
-        "description": "<p><em>Countdown (1d12)</em>. <strong>Spend a Fear</strong> to activate. It ticks down when a PC rolls with Fear. When it triggers, the Ashen Tyrant thrashes about, causing environmental damage (such as an earthquake, avalanche, or collapsing walls). All targets within Far range must make a Strength Reaction Roll. Targets who fail take 2d10+10 physical damage and are Restrained by the rubble until they break free with a successful Strength Roll. Targets who succeed take half damage. If the Ashen Tyrant is defeated while this countdown is active, trigger the countdown immediately as the destruction caused by their death throes.</p><p>@Template[type:emanation|range:f]</p>",
+        "description": "<p><em>Countdown (1d12)</em>. <strong>Spend a Fear</strong> to activate. It ticks down when a PC rolls with Fear. When it triggers, the @Lookup[@name] thrashes about, causing environmental damage (such as an earthquake, avalanche, or collapsing walls). All targets within Far range must make a Strength Reaction Roll. Targets who fail take 2d10+10 physical damage and are Restrained by the rubble until they break free with a successful Strength Roll. Targets who succeed take half damage. If the @Lookup[@name] is defeated while this countdown is active, trigger the countdown immediately as the destruction caused by their death throes.</p><p>@Template[type:emanation|range:f]</p>",
         "resource": null,
         "actions": {
           "OznXxmwiPwzuFPQZ": {
             "type": "attack",
             "_id": "OznXxmwiPwzuFPQZ",
             "systemPath": "actions",
-            "description": "<p>When the countdown triggers, the Ashen Tyrant thrashes about, causing environmental damage (such as an earthquake, avalanche, or collapsing walls). All targets within Far range must make a Strength Reaction Roll. Targets who fail take 2d10+10 physical damage and are Restrained by the rubble until they break free with a successful Strength Roll. Targets who succeed take half damage. If the Ashen Tyrant is defeated while this countdown is active, trigger the countdown immediately as the destruction caused by their death throes.</p><p>@Template[type:emanation|range:f]</p>",
+            "description": "<p>When the countdown triggers, the @Lookup[@name] thrashes about, causing environmental damage (such as an earthquake, avalanche, or collapsing walls). All targets within Far range must make a Strength Reaction Roll. Targets who fail take 2d10+10 physical damage and are Restrained by the rubble until they break free with a successful Strength Roll. Targets who succeed take half damage. If the @Lookup[@name] is defeated while this countdown is active, trigger the countdown immediately as the destruction caused by their death throes.</p><p>@Template[type:emanation|range:f]</p>",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -819,7 +822,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "uWiyaJPXcoW06pOM",
       "img": "icons/creatures/abilities/mouth-teeth-fire-orange.webp",
diff --git a/src/packs/adversaries/adversary_Volcanic_Dragon__Molten_Scourge_eArAPuB38CNR0ZIM.json b/src/packs/adversaries/adversary_Volcanic_Dragon__Molten_Scourge_eArAPuB38CNR0ZIM.json
index d04dab50..b23da064 100644
--- a/src/packs/adversaries/adversary_Volcanic_Dragon__Molten_Scourge_eArAPuB38CNR0ZIM.json
+++ b/src/packs/adversaries/adversary_Volcanic_Dragon__Molten_Scourge_eArAPuB38CNR0ZIM.json
@@ -150,7 +150,8 @@
       "source": "Daggerheart SRD",
       "page": 100,
       "artist": ""
-    }
+    },
+    "size": "gargantuan"
   },
   "prototypeToken": {
     "name": "Volcanic Dragon: Molten Scourge",
@@ -251,14 +252,14 @@
       "name": "Relentless (3)",
       "type": "feature",
       "system": {
-        "description": "<p>The Molten Scourge can be spotlighted up to three times per GM turn. Spend Fear as usual to spotlight them.</p>",
+        "description": "<p>The @Lookup[@name] can be spotlighted up to three times per GM turn. Spend Fear as usual to spotlight them.</p>",
         "resource": null,
         "actions": {
           "ngzXlah4Lv3eK6i5": {
             "type": "effect",
             "_id": "ngzXlah4Lv3eK6i5",
             "systemPath": "actions",
-            "description": "<p>The Molten Scourge can be spotlighted up to three times per GM turn. Spend Fear as usual to spotlight them.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "passive",
             "cost": [
@@ -309,7 +310,7 @@
       "name": "Cracked Scales",
       "type": "feature",
       "system": {
-        "description": "<p>When the Molten Scourge takes damage, roll a number of d6s equal to HP marked. For each result of 4 or higher, you gain a Fear.</p>",
+        "description": "<p>When the @Lookup[@name] takes damage, roll a number of d6s equal to HP marked. For each result of 4 or higher, you gain a Fear.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -334,14 +335,14 @@
       "name": "Shattering Might",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Mark a Stress</strong> to make an attack against a target within Very Close range. On a success, the target takes <strong>4d8+1</strong> physical damage, loses a Hope, and is knocked back to Close range. The Molten Scourge clears a Stress.</p>",
+        "description": "<p><strong>Mark a Stress</strong> to make an attack against a target within Very Close range. On a success, the target takes <strong>4d8+1</strong> physical damage, loses a Hope, and is knocked back to Close range. The @Lookup[@name] clears a Stress.</p>",
         "resource": null,
         "actions": {
           "YNw3E6309te5JPoM": {
             "type": "attack",
             "_id": "YNw3E6309te5JPoM",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to make an attack against a target within Very Close range. On a success, the target takes <strong>4d8+1</strong> physical damage, loses a Hope, and is knocked back to Close range. The Molten Scourge clears a Stress.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -419,7 +420,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "bpjpHxf6tj4i3H4r",
       "img": "icons/creatures/abilities/tail-swipe-green.webp",
@@ -440,14 +442,14 @@
       "name": "Eruption",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Spend a Fear</strong> to erupt lava from beneath the Molten Scourge’s scales, filling the area within Very Close range with molten lava. All targets in that area must succeed on an Agility Reaction Roll or take <strong>4d6+6</strong> physical damage and be knocked back to Close range. This area remains lava. When a creature other than the Molten Scourge enters that area or acts while inside of it, they must mark 6 HP.</p><p>@Template[type:emanation|range:vc]</p>",
+        "description": "<p><strong>Spend a Fear</strong> to erupt lava from beneath the @Lookup[@name]’s scales, filling the area within Very Close range with molten lava. All targets in that area must succeed on an Agility Reaction Roll or take <strong>4d6+6</strong> physical damage and be knocked back to Close range. This area remains lava. When a creature other than the @Lookup[@name] enters that area or acts while inside of it, they must mark 6 HP.</p><p>@Template[type:emanation|range:vc]</p>",
         "resource": null,
         "actions": {
           "OpwKa8tQQoaEIZiS": {
             "type": "attack",
             "_id": "OpwKa8tQQoaEIZiS",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to erupt lava from beneath the Molten Scourge’s scales, filling the area within Very Close range with molten lava. All targets in that area must succeed on an Agility Reaction Roll or take <strong>4d6+6</strong> physical damage and be knocked back to Close range. This area remains lava. When a creature other than the Molten Scourge enters that area or acts while inside of it, they must mark 6 HP.</p><p>@Template[type:emanation|range:vc]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -518,7 +520,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "NuksKUrbf4yj4vR2",
       "img": "icons/magic/fire/blast-jet-stream-embers-red.webp",
@@ -539,14 +542,14 @@
       "name": "Volcanic Breath",
       "type": "feature",
       "system": {
-        "description": "<p>When the Molten Scourge takes Major damage, roll a <strong>d10</strong>. On a result of 8 or higher, the Molten Scourge breathes a flow of lava in front of them within Far range. All targets in that area must make an Agility Reaction Roll. Targets who fail take <strong>2d10+4</strong> physical damage, mark <strong>1d4</strong> Stress, and are Vulnerable until they clear a Stress. Targets who succeed take half damage and must mark a Stress.</p><p>@Template[type:inFront|range:f]</p>",
+        "description": "<p>When the @Lookup[@name] takes Major damage, roll a <strong>d10</strong>. On a result of 8 or higher, the @Lookup[@name] breathes a flow of lava in front of them within Far range. All targets in that area must make an Agility Reaction Roll. Targets who fail take <strong>2d10+4</strong> physical damage, mark <strong>1d4</strong> Stress, and are Vulnerable until they clear a Stress. Targets who succeed take half damage and must mark a Stress.</p><p>@Template[type:inFront|range:f]</p>",
         "resource": null,
         "actions": {
           "OhrssSQhmciZt1Rm": {
             "type": "attack",
             "_id": "OhrssSQhmciZt1Rm",
             "systemPath": "actions",
-            "description": "<p>When the Molten Scourge takes Major damage, roll a <strong>d10</strong>. On a result of 8 or higher, the Molten Scourge breathes a flow of lava in front of them within Far range.</p>",
+            "description": "<p>When the @Lookup[@name] takes Major damage, roll a <strong>d10</strong>. On a result of 8 or higher, the @Lookup[@name] breathes a flow of lava in front of them within Far range.</p>",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -599,7 +602,7 @@
             "type": "attack",
             "_id": "LBNvfABGWcrygpQM",
             "systemPath": "actions",
-            "description": "<p>The Molten Scourge breathes a flow of lava in front of them within Far range. All targets in that area must make an Agility Reaction Roll. Targets who fail take <strong>2d10+4</strong> physical damage, mark <strong>1d4</strong> Stress, and are Vulnerable until they clear a Stress. Targets who succeed take half damage and must mark a Stress.</p><p>@Template[type:inFront|range:f]</p>",
+            "description": "<p>The @Lookup[@name] breathes a flow of lava in front of them within Far range. All targets in that area must make an Agility Reaction Roll. Targets who fail take <strong>2d10+4</strong> physical damage, mark <strong>1d4</strong> Stress, and are Vulnerable until they clear a Stress. Targets who succeed take half damage and must mark a Stress.</p><p>@Template[type:inFront|range:f]</p>",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -699,7 +702,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "2mK8kxfp2WBUeBri",
       "img": "icons/magic/fire/blast-jet-stream-embers-orange.webp",
@@ -759,14 +763,14 @@
       "name": "Lava Splash",
       "type": "feature",
       "system": {
-        "description": "<p>When the Molten Scourge takes Severe damage from an attack within Very Close range, molten blood gushes from the wound and deals <strong>2d10+4</strong> direct physical damage to the attacker.</p>",
+        "description": "<p>When the @Lookup[@name] takes Severe damage from an attack within Very Close range, molten blood gushes from the wound and deals <strong>2d10+4</strong> direct physical damage to the attacker.</p>",
         "resource": null,
         "actions": {
           "WtrAv8peQ71OBoO1": {
             "type": "damage",
             "_id": "WtrAv8peQ71OBoO1",
             "systemPath": "actions",
-            "description": "<p>When the Molten Scourge takes Severe damage from an attack within Very Close range, molten blood gushes from the wound and deals <strong>2d10+4</strong> direct physical damage to the attacker.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -818,7 +822,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "3VdQdUDULZCQPvLZ",
       "img": "icons/magic/fire/blast-jet-stream-embers-red.webp",
@@ -839,11 +844,12 @@
       "name": "Ashen Vengeance",
       "type": "feature",
       "system": {
-        "description": "<p>When the Molten Scourge marks their last HP, replace them with the @UUID[Compendium.daggerheart.adversaries.Actor.pMuXGCSOQaxpi5tb]{Ashen Tyrant} and immediately spotlight them.</p>",
+        "description": "<p>When the @Lookup[@name] marks their last HP, replace them with the @UUID[Compendium.daggerheart.adversaries.Actor.pMuXGCSOQaxpi5tb]{Ashen Tyrant} and immediately spotlight them.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "qYFoyDSdZ5X2h245",
       "img": "icons/magic/fire/flame-burning-eye.webp",
diff --git a/src/packs/adversaries/adversary_Volcanic_Dragon__Obsidian_Predator_ladm7wykhZczYzrQ.json b/src/packs/adversaries/adversary_Volcanic_Dragon__Obsidian_Predator_ladm7wykhZczYzrQ.json
index 2be56990..2e2adbdd 100644
--- a/src/packs/adversaries/adversary_Volcanic_Dragon__Obsidian_Predator_ladm7wykhZczYzrQ.json
+++ b/src/packs/adversaries/adversary_Volcanic_Dragon__Obsidian_Predator_ladm7wykhZczYzrQ.json
@@ -150,7 +150,8 @@
       "source": "Daggerheart SRD",
       "page": 100,
       "artist": ""
-    }
+    },
+    "size": "gargantuan"
   },
   "prototypeToken": {
     "name": "Volcanic Dragon: Obsidian Predator",
@@ -251,14 +252,14 @@
       "name": "Relentless (2)",
       "type": "feature",
       "system": {
-        "description": "<p>The Obsidian Predator can be spotlighted up to two times per GM turn Spend Fear as usual to spotlight them</p>",
+        "description": "<p>The @Lookup[@name] can be spotlighted up to two times per GM turn Spend Fear as usual to spotlight them</p>",
         "resource": null,
         "actions": {
           "XuhmupOVJj8ae6q0": {
             "type": "effect",
             "_id": "XuhmupOVJj8ae6q0",
             "systemPath": "actions",
-            "description": "<p>The Obsidian Predator can be spotlighted up to two times per GM turn Spend Fear as usual to spotlight them.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "passive",
             "cost": [
@@ -309,7 +310,7 @@
       "name": "Flying",
       "type": "feature",
       "system": {
-        "description": "<p> While flying, the Obsidian Predator gains a +3 bonus to their Difficulty.</p>",
+        "description": "<p>While flying, the @Lookup[@name] gains a +3 bonus to their Difficulty.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -378,7 +379,7 @@
       "name": "Obsidian Scales",
       "type": "feature",
       "system": {
-        "description": "<p>The Obsidian Predator is resistant to physical damage.</p>",
+        "description": "<p>The @Lookup[@name] is resistant to physical damage.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -447,14 +448,14 @@
       "name": "Avalanche Tail",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Mark a Stress</strong> to make an attack against all targets within Close range. Targets the Obsidian Predator succeeds against take <strong>4d6+4</strong> physical damage and are knocked.</p><p>@Template[type:emanation|range:c]</p>",
+        "description": "<p><strong>Mark a Stress</strong> to make an attack against all targets within Close range. Targets the @Lookup[@name] succeeds against take <strong>4d6+4</strong> physical damage and are knocked.</p><p>@Template[type:emanation|range:c]</p>",
         "resource": null,
         "actions": {
           "23y0BoufIgNq62j9": {
             "type": "attack",
             "_id": "23y0BoufIgNq62j9",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to make an attack against all targets within Close range. Targets the Obsidian Predator succeeds against take <strong>4d6+4</strong> physical damage and are knocked.</p><p>@Template[type:emanation|range:c]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -528,7 +529,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "8bMOItTuL7PfAYcJ",
       "img": "icons/creatures/abilities/tail-swipe-green.webp",
@@ -588,14 +590,14 @@
       "name": "Dive-Bomb",
       "type": "feature",
       "system": {
-        "description": "<p>If the Obsidian Predator is flying, mark a <strong>Stress</strong> to choose a point within Far range. Move to that point and make an attack against all targets within Very Close range. Targets the Obsidian Predator succeeds against take <strong>2d10+6</strong> physical damage and must mark a Stress and lose a Hope.</p><p>@Template[type:emanation|range:vc]</p>",
+        "description": "<p>If the @Lookup[@name] is flying, mark a <strong>Stress</strong> to choose a point within Far range. Move to that point and make an attack against all targets within Very Close range. Targets the @Lookup[@name] succeeds against take <strong>2d10+6</strong> physical damage and must mark a Stress and lose a Hope.</p><p>@Template[type:emanation|range:vc]</p>",
         "resource": null,
         "actions": {
           "OpAT9nxlbgvnhdBg": {
             "type": "attack",
             "_id": "OpAT9nxlbgvnhdBg",
             "systemPath": "actions",
-            "description": "<p>If the Obsidian Predator is flying, mark a <strong>Stress</strong> to choose a point within Far range. Move to that point and make an attack against all targets within Very Close range. Targets the Obsidian Predator succeeds against take <strong>2d10+6</strong> physical damage and must mark a Stress and lose a Hope.</p><p>@Template[type:emanation|range:vc]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -716,7 +718,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "5wLxyaWJuUhkx1EX",
       "img": "icons/creatures/reptiles/dragon-winged-blue.webp",
@@ -737,11 +740,12 @@
       "name": "Erupting Rage",
       "type": "feature",
       "system": {
-        "description": "<p>When the Obsidian Predator marks their last HP, replace them with the @UUID[Compendium.daggerheart.adversaries.Actor.eArAPuB38CNR0ZIM]{Molten Scourge} and immediately spotlight them.</p>",
+        "description": "<p>When the @Lookup[@name] marks their last HP, replace them with the @UUID[Compendium.daggerheart.adversaries.Actor.eArAPuB38CNR0ZIM]{Molten Scourge} and immediately spotlight them.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "5llfnRwO7mfzDFgT",
       "img": "icons/magic/fire/flame-burning-eye.webp",
diff --git a/src/packs/adversaries/adversary_War_Wizard_noDdT0tsN6FXSmC8.json b/src/packs/adversaries/adversary_War_Wizard_noDdT0tsN6FXSmC8.json
index fcb3dc5a..f087c63d 100644
--- a/src/packs/adversaries/adversary_War_Wizard_noDdT0tsN6FXSmC8.json
+++ b/src/packs/adversaries/adversary_War_Wizard_noDdT0tsN6FXSmC8.json
@@ -122,7 +122,8 @@
       "source": "Daggerheart SRD",
       "page": 91,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "noDdT0tsN6FXSmC8",
@@ -238,7 +239,7 @@
             "type": "effect",
             "_id": "39zC1I5DYozI47lP",
             "systemPath": "actions",
-            "description": "<p>Before or after making a standard attack, you can <strong>mark a Stress</strong> to teleport to a location within Far range.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -286,14 +287,14 @@
       "name": "Refresh Warding Sphere",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Mark a Stress</strong> to refresh the Wizard’s “Warding Sphere” reaction.</p>",
+        "description": "<p><strong>Mark a Stress</strong> to refresh the @Lookup[@name]’s “Warding Sphere” reaction.</p>",
         "resource": null,
         "actions": {
           "FCuksmAGRC4061zm": {
             "type": "effect",
             "_id": "FCuksmAGRC4061zm",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to refresh the Wizard’s “Warding Sphere” reaction.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -320,7 +321,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "dI2MGjC7NFAru1Gd",
       "img": "icons/magic/defensive/shield-barrier-blades-teal.webp",
@@ -348,7 +350,7 @@
             "type": "attack",
             "_id": "vnMq4NuQO6GYxWhM",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> and choose a point within Far range. A Very Close area around that point erupts into impassable terrain. All targets within that area must make an Agility Reaction Roll (14). Targets who fail take <strong>2d10</strong> physical damage and are thrown out of the area. Targets who succeed take half damage and aren’t moved.</p><p>@Template[type:circle|range:vc]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -426,7 +428,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "PnQ0m0FLnpht7oE4",
       "img": "icons/magic/earth/barrier-stone-explosion-red.webp",
@@ -454,7 +457,7 @@
             "type": "attack",
             "_id": "DFHR8LtvjZjHP6BL",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to unleash a precise hail of magical blasts. All targets in the scene must make an Agility Reaction Roll. Targets who fail take <strong>2d12</strong> magic damage. Targets who succeed take half damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -532,7 +535,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "s2luvEVxJLZmOrdh",
       "img": "icons/magic/light/projectiles-trio-pink.webp",
@@ -553,19 +557,19 @@
       "name": "Warding Sphere",
       "type": "feature",
       "system": {
-        "description": "<p>When the Wizard takes damage from an attack within Close range, deal <strong>2d6</strong> magic damage to the attacker. This reaction can’t be used again until the Wizard refreshes it with their “Refresh Warding Sphere” action.</p>",
+        "description": "<p>When the @Lookup[@name] takes damage from an attack within Close range, deal <strong>2d6</strong> magic damage to the attacker. This reaction can’t be used again until the @Lookup[@name] refreshes it with their “Refresh Warding Sphere” action.</p>",
         "resource": null,
         "actions": {
           "2fHrpaZW9toi6nin": {
             "type": "damage",
             "_id": "2fHrpaZW9toi6nin",
             "systemPath": "actions",
-            "description": "<p>When the Wizard takes damage from an attack within Close range, deal <strong>2d6</strong> magic damage to the attacker. This reaction can’t be used again until the Wizard refreshes it with their “Refresh Warding Sphere” action.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
             "uses": {
-              "value": null,
+              "value": 0,
               "max": "1",
               "recovery": null
             },
@@ -611,7 +615,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "9cPigHRcUfJC9gD8",
       "img": "icons/magic/defensive/barrier-shield-dome-blue-purple.webp",
diff --git a/src/packs/adversaries/adversary_Weaponmaster_ZNbQ2jg35LG4t9eH.json b/src/packs/adversaries/adversary_Weaponmaster_ZNbQ2jg35LG4t9eH.json
index d1d936e1..2989468b 100644
--- a/src/packs/adversaries/adversary_Weaponmaster_ZNbQ2jg35LG4t9eH.json
+++ b/src/packs/adversaries/adversary_Weaponmaster_ZNbQ2jg35LG4t9eH.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 83,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "ZNbQ2jg35LG4t9eH",
@@ -222,14 +223,14 @@
       "_id": "tyGgOqQzDSIypoMz",
       "img": "icons/skills/melee/strike-sword-dagger-runes-gold.webp",
       "system": {
-        "description": "<p>Make a standard attack against a target. On a success, <strong>mark a Stress</strong> to Taunt the target until their next successful attack. The next time the Taunted target attacks, they have disadvantage against targets other than the Weaponmaster.</p>",
+        "description": "<p>Make a standard attack against a target. On a success, <strong>mark a Stress</strong> to Taunt the target until their next successful attack. The next time the Taunted target attacks, they have disadvantage against targets other than the @Lookup[@name].</p>",
         "resource": null,
         "actions": {
           "mlPgZJNL2TjykjUb": {
             "type": "attack",
             "_id": "mlPgZJNL2TjykjUb",
             "systemPath": "actions",
-            "description": "<p>Make a standard attack against a target. On a success, <strong>mark a Stress</strong> to Taunt the target until their next successful attack. The next time the Taunted target attacks, they have disadvantage against targets other than the Weaponmaster.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -306,7 +307,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [
         {
@@ -376,7 +378,7 @@
             "type": "healing",
             "_id": "WQ067ZFiG2QMBo2n",
             "systemPath": "actions",
-            "description": "<p>Once per scene, spend a Fear to clear 2 HP and 2 Stress.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -484,7 +486,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
@@ -505,14 +508,14 @@
       "_id": "oYNVPQOy5oQli5Il",
       "img": "icons/skills/melee/strike-weapons-orange.webp",
       "system": {
-        "description": "<p>When the Weaponmaster makes a successful attack against a PC, you gain a Fear.</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack against a PC, you gain a Fear.</p>",
         "resource": null,
         "actions": {
           "jeKcXbdw8gPF4OQA": {
             "type": "healing",
             "_id": "jeKcXbdw8gPF4OQA",
             "systemPath": "actions",
-            "description": "<p>When the Weaponmaster makes a successful attack against a PC, you gain a Fear.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "reaction",
             "cost": [],
@@ -580,7 +583,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "effects": [],
       "folder": null,
diff --git a/src/packs/adversaries/adversary_Young_Dryad_8yUj2Mzvnifhxegm.json b/src/packs/adversaries/adversary_Young_Dryad_8yUj2Mzvnifhxegm.json
index 80fb7ce2..446a4af3 100644
--- a/src/packs/adversaries/adversary_Young_Dryad_8yUj2Mzvnifhxegm.json
+++ b/src/packs/adversaries/adversary_Young_Dryad_8yUj2Mzvnifhxegm.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 83,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "8yUj2Mzvnifhxegm",
@@ -235,7 +236,7 @@
             "type": "attack",
             "_id": "0VOUNQKNjwlLhnRW",
             "systemPath": "actions",
-            "description": "<p><strong>Mark a Stress</strong> to spotlight <strong>1d4</strong> allies within range of a target they can attack without moving. On a success, their attacks deal half damage.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -287,7 +288,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [],
       "folder": null,
@@ -315,7 +317,7 @@
             "type": "effect",
             "_id": "cXOjhfMgKh2yD1mc",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to form a cage around a target within Very Close range and Restrain them until they’re freed with a successful Strength Roll. When a creature makes an action roll against the cage, they must mark a Stress.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -348,7 +350,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "effects": [
         {
@@ -408,14 +411,14 @@
       "_id": "4f79icB7Dd1xLEZQ",
       "img": "icons/skills/melee/strike-weapons-orange.webp",
       "system": {
-        "description": "<p>When the Dryad makes a successful attack against a PC, you gain a Fear.</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack against a PC, you gain a Fear.</p>",
         "resource": null,
         "actions": {
           "9MGyAjWtLbDz8Znu": {
             "type": "healing",
             "_id": "9MGyAjWtLbDz8Znu",
             "systemPath": "actions",
-            "description": "<p>When the Dryad makes a successful attack against a PC, you gain a Fear.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "reaction",
             "cost": [],
@@ -483,7 +486,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "effects": [],
       "folder": null,
diff --git a/src/packs/adversaries/adversary_Young_Ice_Dragon_UGPiPLJsPvMTSKEF.json b/src/packs/adversaries/adversary_Young_Ice_Dragon_UGPiPLJsPvMTSKEF.json
index 28c00c51..b0a3bded 100644
--- a/src/packs/adversaries/adversary_Young_Ice_Dragon_UGPiPLJsPvMTSKEF.json
+++ b/src/packs/adversaries/adversary_Young_Ice_Dragon_UGPiPLJsPvMTSKEF.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 96,
       "artist": ""
-    }
+    },
+    "size": "huge"
   },
   "flags": {},
   "_id": "UGPiPLJsPvMTSKEF",
@@ -226,14 +227,14 @@
       "name": "Relentless (3)",
       "type": "feature",
       "system": {
-        "description": "<p>The Dragon can be spotlighted up to three times per GM turn. Spend Fear as usual to spotlight them.</p>",
+        "description": "<p>The @Lookup[@name] can be spotlighted up to three times per GM turn. Spend Fear as usual to spotlight them.</p>",
         "resource": null,
         "actions": {
           "cmZsrUJa9FJ8gZKP": {
             "type": "effect",
             "_id": "cmZsrUJa9FJ8gZKP",
             "systemPath": "actions",
-            "description": "<p>The Dragon can be spotlighted up to three times per GM turn. Spend Fear as usual to spotlight them.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "passive",
             "cost": [
@@ -284,14 +285,14 @@
       "name": "Rend and Crush",
       "type": "feature",
       "system": {
-        "description": "<p>If a target damaged by the Dragon doesn’t mark an Armor Slot to reduce the damage, they must mark a Stress.</p>",
+        "description": "<p>If a target damaged by the @Lookup[@name] doesn’t mark an Armor Slot to reduce the damage, they must mark a Stress.</p>",
         "resource": null,
         "actions": {
           "dHoMdLfAl6UKjXRP": {
             "type": "damage",
             "_id": "dHoMdLfAl6UKjXRP",
             "systemPath": "actions",
-            "description": "<p>If a target damaged by the Dragon doesn’t mark an Armor Slot to reduce the damage, they must mark a Stress.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [],
@@ -362,7 +363,7 @@
       "name": "No Hope",
       "type": "feature",
       "system": {
-        "description": "<p>When a PC rolls with Fear while within Far range of the Dragon, they lose a Hope.</p>",
+        "description": "<p>When a PC rolls with Fear while within Far range of the @Lookup[@name], they lose a Hope.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -387,14 +388,14 @@
       "name": "Blizzard Breath",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Spend 2 Fear</strong> to release an icy whorl in front of the Dragon within Close range. All targets in this area must make an Agility Reaction Roll. Targets who fail take <strong>4d6+5</strong> magic damage and are Restrained by ice until they break free with a successful Strength Roll. Targets who succeed must mark 2 Stress or take half damage.</p><p>@Template[type:inFront|range:c]</p>",
+        "description": "<p><strong>Spend 2 Fear</strong> to release an icy whorl in front of the @Lookup[@name] within Close range. All targets in this area must make an Agility Reaction Roll. Targets who fail take <strong>4d6+5</strong> magic damage and are Restrained by ice until they break free with a successful Strength Roll. Targets who succeed must mark 2 Stress or take half damage.</p><p>@Template[type:inFront|range:c]</p>",
         "resource": null,
         "actions": {
           "CBecTlgyUBFxgoi5": {
             "type": "attack",
             "_id": "CBecTlgyUBFxgoi5",
             "systemPath": "actions",
-            "description": "<p><strong>Spend 2 Fear</strong> to release an icy whorl in front of the Dragon within Close range. All targets in this area must make an Agility Reaction Roll. Targets who fail take <strong>4d6+5</strong> magic damage and are Restrained by ice until they break free with a successful Strength Roll. Targets who succeed must mark 2 Stress or take half damage.</p><p>@Template[type:inFront|range:c]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -477,7 +478,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "QV2ytK4b1VWF71OS",
       "img": "icons/magic/water/projectiles-ice-faceted-shard-salvo-blue.webp",
@@ -537,14 +539,14 @@
       "name": "Avalanche",
       "type": "feature",
       "system": {
-        "description": "<p><strong>Spend a Fear</strong> to have the Dragon unleash a huge downfall of snow and ice, covering all other creatures within Far range. All targets within this area must succeed on an Instinct Reaction Roll or be buried in snow and rocks, becoming <em>Vulnerable</em> until they dig themselves out from the debris. For each PC that fails the reaction roll, you gain a Fear.</p><p>@Template[type:emanation|range:f]</p>",
+        "description": "<p><strong>Spend a Fear</strong> to have the @Lookup[@name] unleash a huge downfall of snow and ice, covering all other creatures within Far range. All targets within this area must succeed on an Instinct Reaction Roll or be buried in snow and rocks, becoming <em>Vulnerable</em> until they dig themselves out from the debris. For each PC that fails the reaction roll, you gain a Fear.</p><p>@Template[type:emanation|range:f]</p>",
         "resource": null,
         "actions": {
           "G9LjoXShkCcgx8EC": {
             "type": "attack",
             "_id": "G9LjoXShkCcgx8EC",
             "systemPath": "actions",
-            "description": "<p><strong>Spend a Fear</strong> to have the Dragon unleash a huge downfall of snow and ice, covering all other creatures within Far range. All targets within this area must succeed on an Instinct Reaction Roll or be buried in snow and rocks, becoming <em>Vulnerable</em> until they dig themselves out from the debris. For each PC that fails the reaction roll, you gain a Fear.</p><p>@Template[type:emanation|range:f]</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -600,7 +602,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "CcRTxCDCJskiu3fI",
       "img": "icons/magic/water/barrier-ice-wall-snow.webp",
@@ -660,7 +663,7 @@
       "name": "Frozen Scales",
       "type": "feature",
       "system": {
-        "description": "<p>When a creature makes a successful attack against the Dragon from within Very Close range, they must mark a Stress and become Chilled until their next rest or they clear a Stress. While they are Chilled, they have disadvantage on attack rolls.</p>",
+        "description": "<p>When a creature makes a successful attack against the @Lookup[@name] from within Very Close range, they must mark a Stress and become Chilled until their next rest or they clear a Stress. While they are Chilled, they have disadvantage on attack rolls.</p>",
         "resource": null,
         "actions": {
           "QZMpj1qEWI6Er7q2": {
@@ -722,7 +725,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "nXZHOfcYvjg3YMNU",
       "img": "icons/commodities/leather/scales-blue.webp",
@@ -787,14 +791,14 @@
       "name": "Momentum",
       "type": "feature",
       "system": {
-        "description": "<p>When the Dragon makes a successful attack against a PC, you gain a Fear.</p>",
+        "description": "<p>When the @Lookup[@name] makes a successful attack against a PC, you gain a Fear.</p>",
         "resource": null,
         "actions": {
           "5V5SDnUBg9dQOkLW": {
             "type": "healing",
             "_id": "5V5SDnUBg9dQOkLW",
             "systemPath": "actions",
-            "description": "<p>When the Dragon makes a successful attack against a PC, you gain a Fear.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "reaction",
             "cost": [],
@@ -861,7 +865,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "QHdJgT2fvwqquyf7",
       "img": "icons/skills/melee/strike-weapons-orange.webp",
diff --git a/src/packs/adversaries/adversary_Zombie_Legion_YhJrP7rTBiRdX5Fp.json b/src/packs/adversaries/adversary_Zombie_Legion_YhJrP7rTBiRdX5Fp.json
index a67dda37..1b2cce2a 100644
--- a/src/packs/adversaries/adversary_Zombie_Legion_YhJrP7rTBiRdX5Fp.json
+++ b/src/packs/adversaries/adversary_Zombie_Legion_YhJrP7rTBiRdX5Fp.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 101,
       "artist": ""
-    }
+    },
+    "size": "huge"
   },
   "flags": {},
   "_id": "YhJrP7rTBiRdX5Fp",
@@ -220,7 +221,7 @@
       "name": "Horde (2d6+5)",
       "type": "feature",
       "system": {
-        "description": "<p>When the Legion has marked half or more of their HP, their standard attack deals <strong>2d6+5</strong> physical damage instead.</p>",
+        "description": "<p>When the @Lookup[@name] has marked half or more of their HP, their standard attack deals <strong>2d6+5</strong> physical damage instead.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -245,7 +246,7 @@
       "name": "Unyielding",
       "type": "feature",
       "system": {
-        "description": "<p>The Legion has resistance to physical damage.</p>",
+        "description": "<p>The @Lookup[@name] has resistance to physical damage.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -314,14 +315,14 @@
       "name": "Relentless (2)",
       "type": "feature",
       "system": {
-        "description": "<p>The Legion can be spotlighted up to two times per GM turn. Spend Fear as usual to spotlight them.</p>",
+        "description": "<p>The @Lookup[@name] can be spotlighted up to two times per GM turn. Spend Fear as usual to spotlight them.</p>",
         "resource": null,
         "actions": {
           "IACoLeO6VmnK0qkW": {
             "type": "effect",
             "_id": "IACoLeO6VmnK0qkW",
             "systemPath": "actions",
-            "description": "<p>The Legion can be spotlighted up to two times per GM turn. Spend Fear as usual to spotlight them.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "passive",
             "cost": [
@@ -372,14 +373,14 @@
       "name": "Overwhelm",
       "type": "feature",
       "system": {
-        "description": "<p>When the Legion takes Minor damage from an attack within Melee range, you can <strong>mark a Stress</strong> to make a standard attack with advantage against the attacker.</p>",
+        "description": "<p>When the @Lookup[@name] takes Minor damage from an attack within Melee range, you can <strong>mark a Stress</strong> to make a standard attack with advantage against the attacker.</p>",
         "resource": null,
         "actions": {
           "TJ9DhHRuqK5X5Zx5": {
             "type": "effect",
             "_id": "TJ9DhHRuqK5X5Zx5",
             "systemPath": "actions",
-            "description": "<p>When the Legion takes Minor damage from an attack within Melee range, you can <strong>mark a Stress</strong> to make a standard attack with advantage against the attacker.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -406,7 +407,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "d5Vilu9cUub1O6TD",
       "img": "icons/skills/melee/strike-slashes-orange.webp",
diff --git a/src/packs/adversaries/adversary_Zombie_Pack_Nf0v43rtflV56V2T.json b/src/packs/adversaries/adversary_Zombie_Pack_Nf0v43rtflV56V2T.json
index 9b8a118d..32519ac6 100644
--- a/src/packs/adversaries/adversary_Zombie_Pack_Nf0v43rtflV56V2T.json
+++ b/src/packs/adversaries/adversary_Zombie_Pack_Nf0v43rtflV56V2T.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 84,
       "artist": ""
-    }
+    },
+    "size": "huge"
   },
   "flags": {},
   "_id": "Nf0v43rtflV56V2T",
@@ -222,7 +223,7 @@
       "_id": "nNJGAhWu0IuS2ybn",
       "img": "icons/creatures/magical/humanoid-silhouette-aliens-green.webp",
       "system": {
-        "description": "<p>When the Zombies have marked half or more of their HP, their standard attack deals <strong>1d4+2</strong> physical damage instead.</p>",
+        "description": "<p>When the @Lookup[@name] have marked half or more of their HP, their standard attack deals <strong>1d4+2</strong> physical damage instead.</p>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -248,14 +249,14 @@
       "_id": "jQmltra0ovHE33Nx",
       "img": "icons/magic/death/blood-corruption-vomit-red.webp",
       "system": {
-        "description": "<p>When the Zombies mark HP from an attack within Melee range, you can <strong>mark a Stress</strong> to make a standard attack against the attacker.</p>",
+        "description": "<p>When the @Lookup[@name]s mark HP from an attack within Melee range, you can <strong>mark a Stress</strong> to make a standard attack against the attacker.</p>",
         "resource": null,
         "actions": {
           "0Im5AEgp8gJaVJHh": {
             "type": "effect",
             "_id": "0Im5AEgp8gJaVJHh",
             "systemPath": "actions",
-            "description": "<p>When the Zombies mark HP from an attack within Melee range, you can <strong>mark a Stress</strong> to make a standard attack against the attacker.</p>",
+            "description": "",
             "chatDisplay": true,
             "actionType": "action",
             "cost": [
@@ -283,7 +284,8 @@
         },
         "originItemType": null,
         "subType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "effects": [],
       "folder": null,
diff --git a/src/packs/beastforms/beastform_Agile_Scout_a9UoCwtrbgKk02mK.json b/src/packs/beastforms/beastform_Agile_Scout_a9UoCwtrbgKk02mK.json
index 58892f81..71018bc9 100644
--- a/src/packs/beastforms/beastform_Agile_Scout_a9UoCwtrbgKk02mK.json
+++ b/src/packs/beastforms/beastform_Agile_Scout_a9UoCwtrbgKk02mK.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/mammals/rodent-rat-diseaed-gray.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "tiny"
     },
     "mainTrait": "agility",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Aquatic_Predator_ItBVeCl2u5uetgy7.json b/src/packs/beastforms/beastform_Aquatic_Predator_ItBVeCl2u5uetgy7.json
index 46610de3..5287de84 100644
--- a/src/packs/beastforms/beastform_Aquatic_Predator_ItBVeCl2u5uetgy7.json
+++ b/src/packs/beastforms/beastform_Aquatic_Predator_ItBVeCl2u5uetgy7.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/fish/fish-marlin-swordfight-blue.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "large"
     },
     "mainTrait": "agility",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Aquatic_Scout_qqzdFCxyYupWZK23.json b/src/packs/beastforms/beastform_Aquatic_Scout_qqzdFCxyYupWZK23.json
index ef28f80c..95bea914 100644
--- a/src/packs/beastforms/beastform_Aquatic_Scout_qqzdFCxyYupWZK23.json
+++ b/src/packs/beastforms/beastform_Aquatic_Scout_qqzdFCxyYupWZK23.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/tentacles/tentacles-octopus-black-pink.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "tiny"
     },
     "mainTrait": "agility",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Armored_Sentry_8pUHJv3BYdjA4Qdf.json b/src/packs/beastforms/beastform_Armored_Sentry_8pUHJv3BYdjA4Qdf.json
index 8b752488..ba18c05f 100644
--- a/src/packs/beastforms/beastform_Armored_Sentry_8pUHJv3BYdjA4Qdf.json
+++ b/src/packs/beastforms/beastform_Armored_Sentry_8pUHJv3BYdjA4Qdf.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/reptiles/turtle-shell-glowing-green.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "small"
     },
     "mainTrait": "strength",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Epic_Aquatic_Beast_wT4xbF99I55yjKZV.json b/src/packs/beastforms/beastform_Epic_Aquatic_Beast_wT4xbF99I55yjKZV.json
index 710bb3c8..0dfe9c20 100644
--- a/src/packs/beastforms/beastform_Epic_Aquatic_Beast_wT4xbF99I55yjKZV.json
+++ b/src/packs/beastforms/beastform_Epic_Aquatic_Beast_wT4xbF99I55yjKZV.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/fish/squid-kraken-teal.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "gargantuan"
     },
     "mainTrait": "agility",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Great_Predator_afbMt4Ld6nY3mw0N.json b/src/packs/beastforms/beastform_Great_Predator_afbMt4Ld6nY3mw0N.json
index 984c72c8..450a1312 100644
--- a/src/packs/beastforms/beastform_Great_Predator_afbMt4Ld6nY3mw0N.json
+++ b/src/packs/beastforms/beastform_Great_Predator_afbMt4Ld6nY3mw0N.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/mammals/wolf-shadow-black.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "large"
     },
     "mainTrait": "strength",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Great_Winged_Beast_b4BMnTbJ3iPPidSb.json b/src/packs/beastforms/beastform_Great_Winged_Beast_b4BMnTbJ3iPPidSb.json
index 444fda44..c04b2182 100644
--- a/src/packs/beastforms/beastform_Great_Winged_Beast_b4BMnTbJ3iPPidSb.json
+++ b/src/packs/beastforms/beastform_Great_Winged_Beast_b4BMnTbJ3iPPidSb.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/birds/corvid-flying-wings-purple.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "large"
     },
     "mainTrait": "finesse",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Household_Friend_iDmOtiHJJ80AIAVT.json b/src/packs/beastforms/beastform_Household_Friend_iDmOtiHJJ80AIAVT.json
index 80756af0..cfb6aea7 100644
--- a/src/packs/beastforms/beastform_Household_Friend_iDmOtiHJJ80AIAVT.json
+++ b/src/packs/beastforms/beastform_Household_Friend_iDmOtiHJJ80AIAVT.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/mammals/rabbit-movement-glowing-green.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "tiny"
     },
     "mainTrait": "instinct",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Massive_Behemoth_qjwMzPn33aKZACkv.json b/src/packs/beastforms/beastform_Massive_Behemoth_qjwMzPn33aKZACkv.json
index 8e3c0ce5..35715056 100644
--- a/src/packs/beastforms/beastform_Massive_Behemoth_qjwMzPn33aKZACkv.json
+++ b/src/packs/beastforms/beastform_Massive_Behemoth_qjwMzPn33aKZACkv.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/mammals/beast-horned-scaled-glowing-orange.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "huge"
     },
     "mainTrait": "strength",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Mighty_Lizard_94tvcC3D5Kp4lzuN.json b/src/packs/beastforms/beastform_Mighty_Lizard_94tvcC3D5Kp4lzuN.json
index 4dcb396a..390bf054 100644
--- a/src/packs/beastforms/beastform_Mighty_Lizard_94tvcC3D5Kp4lzuN.json
+++ b/src/packs/beastforms/beastform_Mighty_Lizard_94tvcC3D5Kp4lzuN.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/reptiles/lizard-iguana-green.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "large"
     },
     "mainTrait": "instinct",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Mighty_Strider_zRLjqKx4Rn2TjivL.json b/src/packs/beastforms/beastform_Mighty_Strider_zRLjqKx4Rn2TjivL.json
index f77c7b5d..adb9627b 100644
--- a/src/packs/beastforms/beastform_Mighty_Strider_zRLjqKx4Rn2TjivL.json
+++ b/src/packs/beastforms/beastform_Mighty_Strider_zRLjqKx4Rn2TjivL.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/environment/creatures/horse-tan.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "large"
     },
     "mainTrait": "agility",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Mythic_Aerial_Hunter_jV6EuEacyQlHW4SN.json b/src/packs/beastforms/beastform_Mythic_Aerial_Hunter_jV6EuEacyQlHW4SN.json
index 34898d53..dc373c27 100644
--- a/src/packs/beastforms/beastform_Mythic_Aerial_Hunter_jV6EuEacyQlHW4SN.json
+++ b/src/packs/beastforms/beastform_Mythic_Aerial_Hunter_jV6EuEacyQlHW4SN.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/reptiles/dragon-winged-blue.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "gargantuan"
     },
     "mainTrait": "finesse",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Nimble_Grazer_CItO8yX6amQaqyk7.json b/src/packs/beastforms/beastform_Nimble_Grazer_CItO8yX6amQaqyk7.json
index 08d83325..183ad150 100644
--- a/src/packs/beastforms/beastform_Nimble_Grazer_CItO8yX6amQaqyk7.json
+++ b/src/packs/beastforms/beastform_Nimble_Grazer_CItO8yX6amQaqyk7.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/mammals/deer-antlers-glowing-blue.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "medium"
     },
     "mainTrait": "agility",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Pack_Predator_YLisKYYhAGca50WM.json b/src/packs/beastforms/beastform_Pack_Predator_YLisKYYhAGca50WM.json
index 58d28e2d..834493bb 100644
--- a/src/packs/beastforms/beastform_Pack_Predator_YLisKYYhAGca50WM.json
+++ b/src/packs/beastforms/beastform_Pack_Predator_YLisKYYhAGca50WM.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/mammals/wolf-howl-moon-forest-blue.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "medium"
     },
     "mainTrait": "strength",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Pouncing_Predator_33oFSZ1PwFqInHPe.json b/src/packs/beastforms/beastform_Pouncing_Predator_33oFSZ1PwFqInHPe.json
index 5df71fd3..d172d8f3 100644
--- a/src/packs/beastforms/beastform_Pouncing_Predator_33oFSZ1PwFqInHPe.json
+++ b/src/packs/beastforms/beastform_Pouncing_Predator_33oFSZ1PwFqInHPe.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/abilities/cougar-roar-rush-orange.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "medium"
     },
     "mainTrait": "instinct",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Powerful_Beast_m8BVTuJI1wCvzTcf.json b/src/packs/beastforms/beastform_Powerful_Beast_m8BVTuJI1wCvzTcf.json
index bbbc9a66..7fa832e6 100644
--- a/src/packs/beastforms/beastform_Powerful_Beast_m8BVTuJI1wCvzTcf.json
+++ b/src/packs/beastforms/beastform_Powerful_Beast_m8BVTuJI1wCvzTcf.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/abilities/bear-roar-bite-brown-green.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "large"
     },
     "mainTrait": "strength",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Stalking_Arachnid_A4TVRY0D5r9EiVwA.json b/src/packs/beastforms/beastform_Stalking_Arachnid_A4TVRY0D5r9EiVwA.json
index dc1ba68f..16520a9c 100644
--- a/src/packs/beastforms/beastform_Stalking_Arachnid_A4TVRY0D5r9EiVwA.json
+++ b/src/packs/beastforms/beastform_Stalking_Arachnid_A4TVRY0D5r9EiVwA.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/invertebrates/spider-mandibles-brown.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "tiny"
     },
     "mainTrait": "finesse",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Striking_Serpent_1XrZWGDttBAAUxR1.json b/src/packs/beastforms/beastform_Striking_Serpent_1XrZWGDttBAAUxR1.json
index 1cdf3fa3..f78500c9 100644
--- a/src/packs/beastforms/beastform_Striking_Serpent_1XrZWGDttBAAUxR1.json
+++ b/src/packs/beastforms/beastform_Striking_Serpent_1XrZWGDttBAAUxR1.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/reptiles/serpent-horned-green.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "small"
     },
     "mainTrait": "finesse",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Terrible_Lizard_5BABxRe2XVrYTj8N.json b/src/packs/beastforms/beastform_Terrible_Lizard_5BABxRe2XVrYTj8N.json
index d15fa0d9..49818b74 100644
--- a/src/packs/beastforms/beastform_Terrible_Lizard_5BABxRe2XVrYTj8N.json
+++ b/src/packs/beastforms/beastform_Terrible_Lizard_5BABxRe2XVrYTj8N.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/abilities/dragon-breath-purple.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "gargantuan"
     },
     "mainTrait": "strength",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Winged_Beast_mZ4Wlqtss2FlNNvL.json b/src/packs/beastforms/beastform_Winged_Beast_mZ4Wlqtss2FlNNvL.json
index cc78e6a4..4ca44471 100644
--- a/src/packs/beastforms/beastform_Winged_Beast_mZ4Wlqtss2FlNNvL.json
+++ b/src/packs/beastforms/beastform_Winged_Beast_mZ4Wlqtss2FlNNvL.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/birds/raptor-owl-flying-moon.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "tiny"
     },
     "mainTrait": "finesse",
     "advantageOn": {
diff --git a/src/packs/domains/domainCard_Conjure_Swarm_rZPH0BY8Sznc9sFG.json b/src/packs/domains/domainCard_Conjure_Swarm_rZPH0BY8Sznc9sFG.json
index 2fca6775..ededde93 100644
--- a/src/packs/domains/domainCard_Conjure_Swarm_rZPH0BY8Sznc9sFG.json
+++ b/src/packs/domains/domainCard_Conjure_Swarm_rZPH0BY8Sznc9sFG.json
@@ -208,13 +208,13 @@
       },
       "changes": [
         {
-          "key": "system.resistance.magical.reduction",
+          "key": "system.rules.damageReduction.reduceSeverity.magical",
           "mode": 2,
           "value": "1",
           "priority": null
         },
         {
-          "key": "system.resistance.magical.reduction",
+          "key": "system.rules.damageReduction.reduceSeverity.physical",
           "mode": 2,
           "value": "1",
           "priority": null
diff --git a/src/packs/environments/environment_Abandoned_Grove_pGEdzdLkqYtBhxnG.json b/src/packs/environments/environment_Abandoned_Grove_pGEdzdLkqYtBhxnG.json
index 4d9be4f8..c1006da4 100644
--- a/src/packs/environments/environment_Abandoned_Grove_pGEdzdLkqYtBhxnG.json
+++ b/src/packs/environments/environment_Abandoned_Grove_pGEdzdLkqYtBhxnG.json
@@ -49,7 +49,7 @@
     "width": 1,
     "height": 1,
     "texture": {
-      "src": "AbominationVaults.webp",
+      "src": "systems/daggerheart/assets/icons/documents/actors/forest.svg",
       "anchorX": 0.5,
       "anchorY": 0.5,
       "offsetX": 0,
@@ -67,10 +67,10 @@
     "disposition": -1,
     "displayBars": 0,
     "bar1": {
-      "attribute": "resources.hitPoints"
+      "attribute": null
     },
     "bar2": {
-      "attribute": "resources.stress"
+      "attribute": null
     },
     "light": {
       "negative": false,
@@ -118,7 +118,7 @@
         "ring": null,
         "background": null
       },
-      "effects": 1,
+      "effects": 0,
       "subject": {
         "scale": 1,
         "texture": null
@@ -249,7 +249,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "maK5OyfrOxcjCoPt",
       "img": "icons/magic/nature/root-vine-spiral-thorns-teal.webp",
@@ -313,7 +314,8 @@
         "resource": null,
         "actions": {},
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "uG5A2XQuUcPsXzgP",
       "img": "icons/magic/nature/hand-weapon-wood-bark-brown.webp",
@@ -361,7 +363,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "3kkkbnWEvXk5TPK8",
       "img": "icons/magic/unholy/strike-hand-glow-pink.webp",
diff --git a/src/packs/environments/environment_Ambushed_uGEdNYERCTJBEjc5.json b/src/packs/environments/environment_Ambushed_uGEdNYERCTJBEjc5.json
index b32128dd..b0ccd435 100644
--- a/src/packs/environments/environment_Ambushed_uGEdNYERCTJBEjc5.json
+++ b/src/packs/environments/environment_Ambushed_uGEdNYERCTJBEjc5.json
@@ -221,7 +221,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "HfuVxgVidIVsapvI",
       "img": "icons/magic/perception/shadow-stealth-eyes-purple.webp",
diff --git a/src/packs/environments/environment_Ambushers_uXZpebPR77YQ1oXI.json b/src/packs/environments/environment_Ambushers_uXZpebPR77YQ1oXI.json
index ed40af4a..e8ba889a 100644
--- a/src/packs/environments/environment_Ambushers_uXZpebPR77YQ1oXI.json
+++ b/src/packs/environments/environment_Ambushers_uXZpebPR77YQ1oXI.json
@@ -183,7 +183,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "b6Qviz1ANG8OrAYq",
       "img": "icons/skills/wounds/injury-face-impact-orange.webp",
diff --git a/src/packs/environments/environment_Burning_Heart_of_the_Woods_oY69NN4rYxoRE4hl.json b/src/packs/environments/environment_Burning_Heart_of_the_Woods_oY69NN4rYxoRE4hl.json
index 39070236..dc42fb07 100644
--- a/src/packs/environments/environment_Burning_Heart_of_the_Woods_oY69NN4rYxoRE4hl.json
+++ b/src/packs/environments/environment_Burning_Heart_of_the_Woods_oY69NN4rYxoRE4hl.json
@@ -252,7 +252,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "1aOeMMX0XuDtZbbB",
       "img": "icons/magic/nature/root-vine-spiral-thorns-teal.webp",
@@ -391,7 +392,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "JKFkDvwUOP35Tsr1",
       "img": "icons/creatures/magical/construct-face-stone-pink.webp",
@@ -508,7 +510,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "kYxuTZjH7HDUGeWh",
       "img": "icons/magic/air/fog-gas-smoke-brown.webp",
diff --git a/src/packs/environments/environment_Bustling_Marketplace_HZKA7hkej7JJY503.json b/src/packs/environments/environment_Bustling_Marketplace_HZKA7hkej7JJY503.json
index b0b5b591..ad96108b 100644
--- a/src/packs/environments/environment_Bustling_Marketplace_HZKA7hkej7JJY503.json
+++ b/src/packs/environments/environment_Bustling_Marketplace_HZKA7hkej7JJY503.json
@@ -168,7 +168,8 @@
         "resource": null,
         "actions": {},
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "60uDqt9omFifZ7xd",
       "img": "icons/commodities/treasure/brooch-jeweled-pink.webp",
@@ -291,7 +292,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "56qjiKMoN6S9riI6",
       "img": "icons/skills/social/theft-pickpocket-bribery-brown.webp",
@@ -316,7 +318,8 @@
         "resource": null,
         "actions": {},
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "l2FzZpR2reVmlkdp",
       "img": "icons/skills/movement/arrow-upward-blue.webp",
diff --git a/src/packs/environments/environment_Castle_Siege_1eZ32Esq7rfZOjlu.json b/src/packs/environments/environment_Castle_Siege_1eZ32Esq7rfZOjlu.json
index 80344b0f..411a10c7 100644
--- a/src/packs/environments/environment_Castle_Siege_1eZ32Esq7rfZOjlu.json
+++ b/src/packs/environments/environment_Castle_Siege_1eZ32Esq7rfZOjlu.json
@@ -277,7 +277,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "eSTq8Y0v4Dwd13XU",
       "img": "icons/weapons/artillery/catapult-simple.webp",
@@ -302,7 +303,8 @@
         "resource": null,
         "actions": {},
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "U59K0WKVjwbgzMZU",
       "img": "icons/environment/people/charge.webp",
@@ -401,7 +403,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "bemKmwjBtbEFVWXM",
       "img": "icons/magic/earth/projectile-stone-boulder-brown.webp",
diff --git a/src/packs/environments/environment_Chaos_Realm_2Z1mKc65LxNk2PqR.json b/src/packs/environments/environment_Chaos_Realm_2Z1mKc65LxNk2PqR.json
index 9ceca2a6..77781de0 100644
--- a/src/packs/environments/environment_Chaos_Realm_2Z1mKc65LxNk2PqR.json
+++ b/src/packs/environments/environment_Chaos_Realm_2Z1mKc65LxNk2PqR.json
@@ -335,7 +335,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "0OYHJZqT0DlVz5be",
       "img": "icons/magic/control/sihouette-hold-beam-green.webp",
@@ -441,7 +442,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "RNbAdBZM6gDNaRPn",
       "img": "icons/magic/unholy/energy-smoke-pink.webp",
@@ -496,7 +498,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "SZpUJeJETVQtZwae",
       "img": "icons/creatures/unholy/demons-horned-glowing-pink.webp",
@@ -574,7 +577,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "MyIh4CJsDnkjmeYs",
       "img": "icons/magic/perception/hand-eye-pink.webp",
diff --git a/src/packs/environments/environment_Cliffside_Ascent_LPpfdlNKqiZIl04w.json b/src/packs/environments/environment_Cliffside_Ascent_LPpfdlNKqiZIl04w.json
index e72ac02e..548cf7c4 100644
--- a/src/packs/environments/environment_Cliffside_Ascent_LPpfdlNKqiZIl04w.json
+++ b/src/packs/environments/environment_Cliffside_Ascent_LPpfdlNKqiZIl04w.json
@@ -462,7 +462,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "EP4FXeQqbqFGQoIX",
       "img": "icons/skills/movement/arrow-down-pink.webp",
diff --git a/src/packs/environments/environment_Cult_Ritual_QAXXiOKBDmCTauHD.json b/src/packs/environments/environment_Cult_Ritual_QAXXiOKBDmCTauHD.json
index 80074b2e..705c9585 100644
--- a/src/packs/environments/environment_Cult_Ritual_QAXXiOKBDmCTauHD.json
+++ b/src/packs/environments/environment_Cult_Ritual_QAXXiOKBDmCTauHD.json
@@ -195,7 +195,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "0Rgqw1kUPeJ11ldd",
       "img": "icons/magic/unholy/orb-swirling-teal.webp",
@@ -370,7 +371,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "oFfu3hUhp4ta4qwT",
       "img": "icons/magic/unholy/barrier-fire-pink.webp",
@@ -395,7 +397,8 @@
         "resource": null,
         "actions": {},
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "WltEUhtYwfnX8WCc",
       "img": "icons/skills/wounds/blood-drip-droplet-red.webp",
diff --git a/src/packs/environments/environment_Divine_Usurpation_4DLYez7VbMCFDAuZ.json b/src/packs/environments/environment_Divine_Usurpation_4DLYez7VbMCFDAuZ.json
index ada17126..aacf87e9 100644
--- a/src/packs/environments/environment_Divine_Usurpation_4DLYez7VbMCFDAuZ.json
+++ b/src/packs/environments/environment_Divine_Usurpation_4DLYez7VbMCFDAuZ.json
@@ -279,7 +279,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "OWUM3eFiZrIn0Bjd",
       "img": "icons/magic/unholy/orb-hands-pink.webp",
@@ -384,7 +385,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "CL3wPZNOtw6m5WVT",
       "img": "icons/magic/unholy/hand-light-pink.webp",
@@ -561,7 +563,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "AJdG1krRvixBFCZG",
       "img": "icons/magic/unholy/silhouette-robe-evil-glow.webp",
@@ -638,7 +641,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "GUAo44cJCnS1GE9p",
       "img": "icons/magic/unholy/barrier-fire-pink.webp",
diff --git a/src/packs/environments/environment_Hallowed_Temple_dsA6j69AnaJhUyqH.json b/src/packs/environments/environment_Hallowed_Temple_dsA6j69AnaJhUyqH.json
index 342039be..f005fa59 100644
--- a/src/packs/environments/environment_Hallowed_Temple_dsA6j69AnaJhUyqH.json
+++ b/src/packs/environments/environment_Hallowed_Temple_dsA6j69AnaJhUyqH.json
@@ -226,7 +226,7 @@
       "name": "Divine Guidance",
       "type": "feature",
       "system": {
-        "description": "<p>A PC who prays to a deity while in the Hallowed Temple can make an Instinct Roll to receive answers. If the god they beseech isn’t welcome in this temple, the roll is made with disadvantage.</p><ul><li><p><strong>Critical Success:</strong> The PC gains clear information. Additionally, they gain [[/r 1d4]] Hope, which can be distributed between the party if they share the vision and guidance they received. </p></li><li><p><strong>Success with Hope:</strong> The PC receives clear information. </p></li><li><p><strong>Success with Fear:</strong> The PC receives brief flashes of insight and an emotional impression conveying an answer. </p></li><li><p><strong>Any Failure:</strong> The PC receives only vague flashes. They can mark a Stress to receive one clear image without context.</p></li></ul><pre><code>What does it feel like as you are touched by this vision? What feeling lingers after the images have passed?</code></pre>",
+        "description": "<p>A PC who prays to a deity while in the Hallowed Temple can make an Instinct Roll to receive answers. If the god they beseech isn’t welcome in this temple, the roll is made with disadvantage.</p><ul><li><p><strong>Critical Success:</strong> The PC gains clear information. Additionally, they gain [[/r 1d4]] Hope, which can be distributed between the party if they share the vision and guidance they received.</p></li><li><p><strong>Success with Hope:</strong> The PC receives clear information.</p></li><li><p><strong>Success with Fear:</strong> The PC receives brief flashes of insight and an emotional impression conveying an answer.</p></li><li><p><strong>Any Failure:</strong> The PC receives only vague flashes. They can mark a Stress to receive one clear image without context.</p></li></ul><section class=\"secret\" id=\"secret-EYCrn403Zbz0NQKo\"><p><em>What does it feel like as you are touched by this vision? What feeling lingers after the images have passed?</em></p></section>",
         "resource": null,
         "actions": {},
         "originItemType": null,
@@ -308,7 +308,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "vICfHK2urDQ2Jm8s",
       "img": "icons/magic/holy/barrier-shield-winged-blue.webp",
@@ -363,7 +364,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "8tGAuFRyM4onvQ2o",
       "img": "icons/magic/holy/projectiles-blades-salvo-yellow.webp",
diff --git a/src/packs/environments/environment_Haunted_City_OzYbizKraK92FDiI.json b/src/packs/environments/environment_Haunted_City_OzYbizKraK92FDiI.json
index 30a436bd..1bd07a57 100644
--- a/src/packs/environments/environment_Haunted_City_OzYbizKraK92FDiI.json
+++ b/src/packs/environments/environment_Haunted_City_OzYbizKraK92FDiI.json
@@ -259,7 +259,8 @@
         "resource": null,
         "actions": {},
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "ZA2RzxH5FlnrcYLN",
       "img": "icons/magic/death/undead-ghosts-trio-blue.webp",
@@ -331,7 +332,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "i0FV2Djaq0vB57cq",
       "img": "icons/magic/death/skull-weapon-staff-glow-pink.webp",
diff --git a/src/packs/environments/environment_Imperial_Court_jr1xAoXzVwVblzxI.json b/src/packs/environments/environment_Imperial_Court_jr1xAoXzVwVblzxI.json
index 5af29dd0..4b49c341 100644
--- a/src/packs/environments/environment_Imperial_Court_jr1xAoXzVwVblzxI.json
+++ b/src/packs/environments/environment_Imperial_Court_jr1xAoXzVwVblzxI.json
@@ -268,7 +268,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "tm9FL5gJF7Oheu21",
       "img": "icons/magic/death/skull-energy-light-white.webp",
@@ -340,7 +341,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "HwSKX5r40ux0OfJN",
       "img": "icons/sundries/documents/document-sealed-red-white.webp",
@@ -419,7 +421,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "YPMgWUagVq1Hicqo",
       "img": "icons/magic/perception/orb-eye-scrying.webp",
diff --git a/src/packs/environments/environment_Local_Tavern_cM4X81DOyvxNIi52.json b/src/packs/environments/environment_Local_Tavern_cM4X81DOyvxNIi52.json
index 8ff4d3b5..105f230f 100644
--- a/src/packs/environments/environment_Local_Tavern_cM4X81DOyvxNIi52.json
+++ b/src/packs/environments/environment_Local_Tavern_cM4X81DOyvxNIi52.json
@@ -201,7 +201,8 @@
         "resource": null,
         "actions": {},
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "cAbSo5VQHxJqJPKm",
       "img": "icons/magic/unholy/silhouette-robe-evil-power.webp",
@@ -222,11 +223,12 @@
       "name": "Someone Comes to Town",
       "type": "feature",
       "system": {
-        "description": "<p>Introduce a signifi cant NPC who wants to hire the party for something or who relates to a PC’s background. </p><section id=\"secret-DB6Th0yGCjAsAZp6\" class=\"secret\"><p><em>Did they know the PCs were here? What do they want in this town?</em></p></section>",
+        "description": "<p>Introduce a significant NPC who wants to hire the party for something or who relates to a PC’s background.</p><section class=\"secret\" id=\"secret-DB6Th0yGCjAsAZp6\"><p><em>Did they know the PCs were here? What do they want in this town?</em></p></section>",
         "resource": null,
         "actions": {},
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "QPezCAC18vIc5xRC",
       "img": "icons/environment/people/commoner.webp",
@@ -303,7 +305,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "H3LNvVrUbsAkgjni",
       "img": "icons/skills/melee/unarmed-punch-fist-white.webp",
diff --git a/src/packs/environments/environment_Mountain_Pass_acMu9wJrMZZzLSTJ.json b/src/packs/environments/environment_Mountain_Pass_acMu9wJrMZZzLSTJ.json
index 3be39fc8..8e7cf1c8 100644
--- a/src/packs/environments/environment_Mountain_Pass_acMu9wJrMZZzLSTJ.json
+++ b/src/packs/environments/environment_Mountain_Pass_acMu9wJrMZZzLSTJ.json
@@ -222,7 +222,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "jkm03DXYYajsRk2j",
       "img": "icons/magic/earth/projectile-boulder-dust.webp",
@@ -247,7 +248,8 @@
         "resource": null,
         "actions": {},
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "hkZVEduCWJFR0h2S",
       "img": "icons/creatures/birds/corvid-flying-wings-purple.webp",
@@ -382,7 +384,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "K8ld4m5yTA6WZwUs",
       "img": "icons/magic/water/snowflake-ice-blue-white.webp",
diff --git a/src/packs/environments/environment_Necromancer_s_Ossuary_h3KyRL7AshhLAmcH.json b/src/packs/environments/environment_Necromancer_s_Ossuary_h3KyRL7AshhLAmcH.json
index 1cb43050..e96b9177 100644
--- a/src/packs/environments/environment_Necromancer_s_Ossuary_h3KyRL7AshhLAmcH.json
+++ b/src/packs/environments/environment_Necromancer_s_Ossuary_h3KyRL7AshhLAmcH.json
@@ -311,7 +311,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "asSGMUdf4gG4PO8F",
       "img": "icons/magic/death/bones-crossed-gray.webp",
@@ -383,7 +384,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "mnpqMpYCjdlwtvBp",
       "img": "icons/magic/death/skull-weapon-staff-glow-pink.webp",
@@ -438,7 +440,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "chJRXNg5zyTGbcG5",
       "img": "icons/magic/death/undead-zombie-grave-green.webp",
diff --git a/src/packs/environments/environment_Outpost_Town_YezryR32uo39xRxW.json b/src/packs/environments/environment_Outpost_Town_YezryR32uo39xRxW.json
index d0f4eae2..bc3c211d 100644
--- a/src/packs/environments/environment_Outpost_Town_YezryR32uo39xRxW.json
+++ b/src/packs/environments/environment_Outpost_Town_YezryR32uo39xRxW.json
@@ -222,7 +222,8 @@
         "resource": null,
         "actions": {},
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "uxu8YrvYVxP3Qc2y",
       "img": "icons/skills/melee/unarmed-punch-fist-yellow-red.webp",
@@ -277,7 +278,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "reaction"
       },
       "_id": "21tdueq5Wgvj3vG4",
       "img": "icons/environment/settlement/watchtower-moonlit-blue.webp",
diff --git a/src/packs/environments/environment_Pitched_Battle_EWD3ZsLoK6VMVOf7.json b/src/packs/environments/environment_Pitched_Battle_EWD3ZsLoK6VMVOf7.json
index 36e21f82..7be27924 100644
--- a/src/packs/environments/environment_Pitched_Battle_EWD3ZsLoK6VMVOf7.json
+++ b/src/packs/environments/environment_Pitched_Battle_EWD3ZsLoK6VMVOf7.json
@@ -172,7 +172,8 @@
         "resource": null,
         "actions": {},
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "fnvOiHKsd34EaLqG",
       "img": "icons/magic/fire/flame-burning-building.webp",
@@ -278,7 +279,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "r9kkodHghWm01mje",
       "img": "icons/magic/fire/explosion-flame-lightning-strike.webp",
@@ -303,7 +305,8 @@
         "resource": null,
         "actions": {},
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "ZAIvH5CfhehW48EY",
       "img": "icons/environment/people/charge.webp",
diff --git a/src/packs/environments/environment_Raging_River_t4cdqTfzcqP3H1vJ.json b/src/packs/environments/environment_Raging_River_t4cdqTfzcqP3H1vJ.json
index 40dbb1c6..5c973fa6 100644
--- a/src/packs/environments/environment_Raging_River_t4cdqTfzcqP3H1vJ.json
+++ b/src/packs/environments/environment_Raging_River_t4cdqTfzcqP3H1vJ.json
@@ -296,7 +296,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "WsNoSwwtv0r80BMj",
       "img": "icons/magic/water/wave-water-teal.webp",
@@ -390,7 +391,8 @@
           }
         },
         "originItemType": null,
-        "originId": null
+        "originId": null,
+        "featureForm": "action"
       },
       "_id": "SDTS3LOPMVJOt1S1",
       "img": "icons/creatures/reptiles/snake-fangs-bite-green-yellow.webp",
diff --git a/src/packs/items/armors/armor_Elundrian_Chain_Mail_Q6LxmtFetDDkoZVZ.json b/src/packs/items/armors/armor_Elundrian_Chain_Armor_Q6LxmtFetDDkoZVZ.json
similarity index 97%
rename from src/packs/items/armors/armor_Elundrian_Chain_Mail_Q6LxmtFetDDkoZVZ.json
rename to src/packs/items/armors/armor_Elundrian_Chain_Armor_Q6LxmtFetDDkoZVZ.json
index d8b938fd..abf81dae 100644
--- a/src/packs/items/armors/armor_Elundrian_Chain_Mail_Q6LxmtFetDDkoZVZ.json
+++ b/src/packs/items/armors/armor_Elundrian_Chain_Armor_Q6LxmtFetDDkoZVZ.json
@@ -1,6 +1,6 @@
 {
   "folder": "hLn0v6ov6KuFgptu",
-  "name": "Elundrian Chain Mail",
+  "name": "Elundrian Chain Armor",
   "type": "armor",
   "_id": "Q6LxmtFetDDkoZVZ",
   "img": "icons/equipment/chest/breastplate-sculpted-green.webp",
diff --git a/src/packs/subclasses/feature_Wings_of_Light_KkQH0tYhagIqe2MT.json b/src/packs/subclasses/feature_Wings_of_Light_KkQH0tYhagIqe2MT.json
index f7157194..5b86e348 100644
--- a/src/packs/subclasses/feature_Wings_of_Light_KkQH0tYhagIqe2MT.json
+++ b/src/packs/subclasses/feature_Wings_of_Light_KkQH0tYhagIqe2MT.json
@@ -69,12 +69,12 @@
           }
         ],
         "target": {
-          "type": "any",
+          "type": "self",
           "amount": null
         },
         "name": "Spend Hope",
         "img": "icons/magic/light/projectile-beam-yellow.webp",
-        "range": ""
+        "range": "self"
       }
     },
     "originItemType": null,
diff --git a/styles/less/dialog/item-transfer/sheet.less b/styles/less/dialog/item-transfer/sheet.less
index dd55fdb2..7807e479 100644
--- a/styles/less/dialog/item-transfer/sheet.less
+++ b/styles/less/dialog/item-transfer/sheet.less
@@ -1,20 +1,35 @@
 .daggerheart.dh-style.dialog.item-transfer {
-    .item-transfer-container {
-        display: grid;
-        grid-template-columns: 1fr 42px;
-        gap: 4px;
+    .summary {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        gap: 3rem;
+        
+        .actor-img {
+            border-radius: 50%;
+            width: 5rem;
+            height: 5rem;
+            object-fit: cover;
+            object-position: top center;
+        }
 
-        .number-display {
-            text-align: center;
+        .granted-item {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            font-size: var(--font-size-32);
+
+            img {
+                width: 2rem;
+                height: 2rem;
+                object-fit: contain;
+                border-radius: 3px;
+            }
         }
     }
-
-    .item-sheet-footer {
-        padding-top: 8px;
-        display: flex;
-
-        button {
-            flex: 1;
-        }
+    label {
+        flex: 0;
+        margin-right: 0.5rem;
     }
 }
diff --git a/styles/less/global/chat.less b/styles/less/global/chat.less
index 3f83294a..69ee369a 100644
--- a/styles/less/global/chat.less
+++ b/styles/less/global/chat.less
@@ -25,6 +25,7 @@
     padding: 8px;
 }
 
+.vtt.stream.system-daggerheart .chat-sidebar,
 .daggerheart.chat-sidebar,
 #chat-notifications {
     .chat-log {
diff --git a/styles/less/global/elements.less b/styles/less/global/elements.less
index 79deb99d..e740d917 100755
--- a/styles/less/global/elements.less
+++ b/styles/less/global/elements.less
@@ -6,7 +6,8 @@
 
     input[type='text'],
     input[type='number'],
-    textarea {
+    textarea,
+    .input[contenteditable] {
         background: light-dark(transparent, transparent);
         border-radius: 6px;
         box-shadow: 0 4px 30px @soft-shadow;
@@ -43,6 +44,14 @@
         }
     }
 
+    .input[contenteditable] {
+        cursor: var(--cursor-text);
+        &:empty:before {
+            color: light-dark(@dark-40, @beige-50);
+            content: attr(placeholder);
+        }
+    }
+
     input[type='checkbox'],
     input[type='radio'] {
         &:checked::after {
diff --git a/styles/less/global/inventory-item.less b/styles/less/global/inventory-item.less
index d936358b..c8a29795 100644
--- a/styles/less/global/inventory-item.less
+++ b/styles/less/global/inventory-item.less
@@ -129,7 +129,8 @@
 
             .item-label {
                 flex: 1;
-                align-self: center;
+                align-self: stretch;
+                align-content: center;
 
                 .item-name {
                     font-size: var(--font-size-14);
diff --git a/styles/less/sheets/actors/adversary/header.less b/styles/less/sheets/actors/adversary/header.less
index d4a7812e..8bd3fcee 100644
--- a/styles/less/sheets/actors/adversary/header.less
+++ b/styles/less/sheets/actors/adversary/header.less
@@ -12,18 +12,19 @@
             gap: 5px;
             align-items: center;
             justify-content: space-between;
-            padding: 0;
-            padding-top: 5px;
-            padding-bottom: 8px;
+            padding: 8px 0;
             flex: 1;
 
-            input[type='text'] {
+            h1 {
+                display: flex;
+                flex: 1;
+                padding: 6px 0 0 0;
                 font-size: var(--font-size-32);
-                height: 42px;
                 text-align: start;
                 border: 1px solid transparent;
                 outline: 2px solid transparent;
                 transition: all 0.3s ease;
+                word-break: break-word;
 
                 &:hover {
                     outline: 2px solid light-dark(@dark, @golden);
@@ -39,6 +40,7 @@
             .tag {
                 display: flex;
                 flex-direction: row;
+                gap: 4px;
                 justify-content: center;
                 align-items: center;
                 padding: 3px 5px;
diff --git a/styles/less/sheets/actors/adversary/sidebar.less b/styles/less/sheets/actors/adversary/sidebar.less
index f8537525..4e7535c1 100644
--- a/styles/less/sheets/actors/adversary/sidebar.less
+++ b/styles/less/sheets/actors/adversary/sidebar.less
@@ -344,15 +344,19 @@
 
                     .experience-name {
                         width: 180px;
+                        display: flex;
+                        align-items: center;
                         text-align: start;
                         font-size: var(--font-size-14);
                         color: light-dark(@dark, @beige);
+                        line-height: 1;
                     }
                 }
 
                 .experience-value {
                     height: 25px;
                     width: 35px;
+                    min-width: 35px;
                     font-size: var(--font-size-14);
                     color: light-dark(@dark, @beige);
                     align-content: center;
diff --git a/styles/less/sheets/actors/character/header.less b/styles/less/sheets/actors/character/header.less
index 80089cf7..4115fbd5 100644
--- a/styles/less/sheets/actors/character/header.less
+++ b/styles/less/sheets/actors/character/header.less
@@ -34,19 +34,22 @@
         .name-row {
             display: flex;
             gap: 5px;
-            align-items: end;
+            align-items: start;
             justify-content: space-between;
             padding: 0;
             padding-top: 5px;
             flex: 1;
 
-            input[type='text'] {
+            h1 {
+                display: flex;
+                flex: 1;
+                padding: 6px 0 0 0;
                 font-size: var(--font-size-32);
-                height: 42px;
                 text-align: start;
                 border: 1px solid transparent;
                 outline: 2px solid transparent;
                 transition: all 0.3s ease;
+                word-break: break-word;
 
                 &:hover {
                     outline: 2px solid light-dark(@dark, @golden);
@@ -57,6 +60,8 @@
                 white-space: nowrap;
                 display: flex;
                 justify-content: end;
+                height: var(--font-size-32);
+                margin-top: 6px;
 
                 .label {
                     display: flex;
diff --git a/styles/less/sheets/actors/character/sidebar.less b/styles/less/sheets/actors/character/sidebar.less
index e66cba82..04baf2b9 100644
--- a/styles/less/sheets/actors/character/sidebar.less
+++ b/styles/less/sheets/actors/character/sidebar.less
@@ -592,6 +592,7 @@
                 .experience-value {
                     height: 25px;
                     width: 35px;
+                    min-width: 35px;
                     font-size: var(--font-size-14);
                     color: light-dark(@dark, @beige);
                     align-content: center;
@@ -599,6 +600,12 @@
                     margin-right: 5px;
                 }
 
+                .experience-name {
+                    display: flex;
+                    align-items: center;
+                    line-height: 1;
+                }
+
                 .controls {
                     margin-left: auto;
                 }
diff --git a/styles/less/sheets/actors/companion/details.less b/styles/less/sheets/actors/companion/details.less
index cbdc25e6..2e43cac4 100644
--- a/styles/less/sheets/actors/companion/details.less
+++ b/styles/less/sheets/actors/companion/details.less
@@ -57,6 +57,9 @@
 
             .experience-name {
                 width: 180px;
+                display: flex;
+                align-items: center;
+                line-height: 1;
                 text-align: start;
                 font-size: var(--font-size-14);
                 color: light-dark(@dark, @beige);
@@ -66,6 +69,7 @@
         .experience-value {
             height: 25px;
             width: 35px;
+            min-width: 35px;
             font-size: var(--font-size-14);
             color: light-dark(@dark, @beige);
             align-content: center;
diff --git a/styles/less/sheets/items/beastform.less b/styles/less/sheets/items/beastform.less
index 162c4925..100b024a 100644
--- a/styles/less/sheets/items/beastform.less
+++ b/styles/less/sheets/items/beastform.less
@@ -5,5 +5,8 @@
             flex-direction: column;
             margin-top: 10px;
         }
+        .hint {
+            font-style: italic;
+        }
     }
 }
diff --git a/styles/less/ui/chat/chat.less b/styles/less/ui/chat/chat.less
index 828e2774..6f0e5e85 100644
--- a/styles/less/ui/chat/chat.less
+++ b/styles/less/ui/chat/chat.less
@@ -152,6 +152,7 @@
     }
 }
 
+.vtt.stream.system-daggerheart .chat-sidebar,
 .daggerheart,
 #chat-notifications {
     .chat-message {
diff --git a/styles/less/ui/ownership-selection/ownership-selection.less b/styles/less/ui/ownership-selection/ownership-selection.less
index 76ae0930..ae7b5e2d 100644
--- a/styles/less/ui/ownership-selection/ownership-selection.less
+++ b/styles/less/ui/ownership-selection/ownership-selection.less
@@ -36,6 +36,10 @@
             }
         }
 
+        .hint {
+            text-align: center;
+        }
+
         footer {
             margin-top: 10px;
             button {
diff --git a/styles/less/ui/settings/settings.less b/styles/less/ui/settings/settings.less
index 49c9fc7c..34f17d53 100644
--- a/styles/less/ui/settings/settings.less
+++ b/styles/less/ui/settings/settings.less
@@ -16,6 +16,12 @@
             }
         }
 
+        &.three-columns {
+            display: grid;
+            grid-template-columns: 1fr 1fr 1fr;
+            gap: 2px;
+        }
+
         &.six-columns {
             display: grid;
             grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
diff --git a/styles/less/ux/index.less b/styles/less/ux/index.less
index dd0492da..0bd1b71e 100644
--- a/styles/less/ux/index.less
+++ b/styles/less/ux/index.less
@@ -1,4 +1,6 @@
 @import './tooltip/tooltip.less';
 @import './tooltip/battlepoints.less';
 @import './tooltip/bordered-tooltip.less';
+@import './tooltip/domain-cards.less';
+
 @import './autocomplete/autocomplete.less';
diff --git a/styles/less/ux/tooltip/domain-cards.less b/styles/less/ux/tooltip/domain-cards.less
new file mode 100644
index 00000000..3ef1d83a
--- /dev/null
+++ b/styles/less/ux/tooltip/domain-cards.less
@@ -0,0 +1,18 @@
+@import '../../utils/colors.less';
+@import '../../utils/fonts.less';
+
+.theme-light .daggerheart.dh-style.tooltip {
+    &.domain-card {
+        .item-icons-list .item-icon img {
+            filter: @bright-beige-filter;
+        }
+    }
+}
+
+.daggerheart.dh-style.tooltip {
+    &.domain-card {
+        .item-icons-list .item-icon img {
+            filter: @golden-filter !important;
+        }
+    }
+}
diff --git a/styles/less/ux/tooltip/tooltip.less b/styles/less/ux/tooltip/tooltip.less
index 2aa1c2c7..d9a83d59 100644
--- a/styles/less/ux/tooltip/tooltip.less
+++ b/styles/less/ux/tooltip/tooltip.less
@@ -1,5 +1,246 @@
+@import '../../utils/colors.less';
+@import '../../utils/fonts.less';
+
+#tooltip:has(div.daggerheart.dh-style.tooltip.card-style),
+aside[role='tooltip']:has(div.daggerheart.dh-style.tooltip.card-style) {
+    padding: 0;
+    border: none;
+    border-radius: 10px;
+    height: max-content;
+    max-height: 650px;
+    width: 18rem;
+    background-image: url('../assets/parchments/dh-parchment-dark.png');
+    outline: 1px solid light-dark(@dark-80, @beige-80);
+    box-shadow: 0 0 25px rgba(0, 0, 0, 0.80);
+
+    .tooltip-title {
+        font-size: var(--font-size-20);
+        color: light-dark(@dark-blue, @golden);
+        font-weight: 700;
+        margin-bottom: 5px;
+    }
+
+    .tooltip-subtitle {
+        margin: 0;
+    }
+
+    .tooltip-image {
+        width: 100%;
+        height: 160px;
+        object-fit: cover;
+        mask-image: linear-gradient(180deg, black 88%, transparent 100%);
+    }
+
+    .tooltip-description {
+        font-style: inherit;
+        text-align: inherit;
+        width: 100%;
+        padding: 5px 10px;
+        position: relative;
+        margin-top: 5px;
+
+        &::before {
+            content: '';
+            background: @golden;
+            mask-image: linear-gradient(270deg, transparent 0%, black 50%, transparent 100%);
+            height: 2px;
+            width: calc(100% - 10px);
+        }
+
+        &::before {
+            position: absolute;
+            top: -5px;
+        }
+    }
+
+    .tooltip-tags {
+        display: flex;
+        flex-direction: column;
+        gap: 10px;
+        width: 100%;
+        padding: 5px 10px;
+        position: relative;
+        padding-top: 10px;
+        max-height: 150px;
+        overflow-y: auto;
+        position: relative;
+
+        scrollbar-width: thin;
+        scrollbar-color: light-dark(@dark-blue, @golden) transparent;
+
+        &::before {
+            content: '';
+            background: @golden;
+            mask-image: linear-gradient(270deg, transparent 0%, black 50%, transparent 100%);
+            height: 2px;
+            width: calc(100% - 10px);
+        }
+
+        &::before {
+            position: absolute;
+            top: 0px;
+        }
+
+        .tooltip-tag {
+            display: flex;
+            gap: 10px;
+            flex-direction: column;
+
+            .tooltip-tag-label-container {
+                display: flex;
+                align-items: center;
+                gap: 5px;
+
+                img {
+                    width: 40px;
+                    height: 40px;
+                    border-radius: 3px;
+                }
+            }
+        }
+    }
+
+    .tags {
+        display: flex;
+        gap: 5px 10px;
+        padding-bottom: 16px;
+        flex-wrap: wrap;
+        justify-content: center;
+
+        &.advantages {
+            width: 100%;
+            padding: 5px 10px;
+            padding-bottom: 16px;
+            position: relative;
+            margin-top: 5px;
+
+            &::before {
+                content: '';
+                background: @golden;
+                mask-image: linear-gradient(270deg, transparent 0%, black 50%, transparent 100%);
+                height: 2px;
+                width: calc(100% - 10px);
+            }
+
+            &::before {
+                position: absolute;
+                top: -5px;
+            }
+
+            .tag {
+                background: @green-10;
+                color: @green;
+                border-color: @green;
+            }
+        }
+
+        .tag {
+            display: flex;
+            flex-direction: row;
+            justify-content: center;
+            align-items: center;
+            padding: 3px 5px;
+            font-size: var(--font-size-12);
+            font: @font-body;
+
+            background: light-dark(@dark-15, @beige-15);
+            border: 1px solid light-dark(@dark, @beige);
+            border-radius: 3px;
+        }
+
+        .label {
+            display: flex;
+            flex-direction: row;
+            justify-content: center;
+            align-items: center;
+            font-size: var(--font-size-12);
+        }
+    }
+
+    .item-icons-list {
+        position: absolute;
+        display: flex;
+        flex-direction: column;
+        gap: 5px;
+        align-items: end;
+        justify-content: center;
+        top: 25px;
+        right: 10px;
+        z-index: 1;
+
+        .item-icon {
+            display: flex;
+            align-items: center;
+            justify-content: end;
+            text-align: center;
+            padding-right: 8px;
+            width: 50px;
+            height: 50px;
+            font-size: 1.2rem;
+            background: light-dark(@dark-blue-60, @dark-golden-80);
+            backdrop-filter: blur(8px);
+            border: 4px double light-dark(@beige, @golden);
+            color: light-dark(@beige, @golden);
+            border-radius: 999px;
+            transition: all 0.3s ease;
+
+            .recall-label {
+                font-size: var(--font-size-14);
+                opacity: 0;
+                margin-right: 0.3rem;
+                transition: all 0.3s ease;
+            }
+
+            i {
+                font-size: 0.8rem;
+            }
+
+            img {
+                height: 24px;
+                width: 24px;
+            }
+
+            &:hover {
+                max-width: 300px;
+                padding: 0 10px;
+                border-radius: 60px;
+
+                .recall-label {
+                    opacity: 1;
+                }
+            }
+        }
+    }
+
+    .tooltip-hint {
+        border-radius: 3px;
+        padding: 3px;
+        background: light-dark(@dark-blue-60, @rustic-brown-80);
+        color: light-dark(@dark-blue, @golden);
+        font-size: 12px;
+        margin-bottom: 10px;
+    }
+}
+
+aside[role='tooltip'].locked-tooltip:has(div.daggerheart.dh-style.tooltip.card-style) {
+    box-shadow: 0 0 25px @golden-90;
+    outline: 1px solid light-dark(@dark-blue, @golden);
+}
+
+.theme-light #tooltip:has(div.daggerheart.dh-style.tooltip.card-style),
+.theme-light aside[role='tooltip']:has(div.daggerheart.dh-style.tooltip.card-style) {
+    background-image: url('../assets/parchments/dh-parchment-light.png');
+}
+
+.theme-light aside[role='tooltip'].locked-tooltip:has(div.daggerheart.dh-style.tooltip) {
+    box-shadow: 0 0 25px @dark-blue-90;
+    outline: 1px solid light-dark(@dark-blue, @golden);
+    
+}
+
 #tooltip,
-.locked-tooltip {
+.locked-tooltip,
+.daggerheart.dh-style.tooltip {
     &.wide {
         max-width: 480px;
 
@@ -48,11 +289,6 @@
             font-style: italic;
         }
 
-        .tooltip-sub-title {
-            margin: 0;
-            color: light-dark(@dark-blue, @beige);
-        }
-
         .tooltip-information-section {
             width: 100%;
             display: grid;
@@ -104,46 +340,6 @@
             }
         }
 
-        .tooltip-tags {
-            width: 100%;
-            display: flex;
-            flex-direction: column;
-            gap: 4px;
-
-            .tooltip-tag {
-                width: 100%;
-                display: grid;
-                grid-template-columns: 80px 1fr;
-                align-items: start;
-                gap: 8px;
-                padding: 4px;
-                border: 1px solid light-dark(@dark-blue, @golden);
-                border-radius: 6px;
-
-                .tooltip-tag-label-container {
-                    display: flex;
-                    align-items: center;
-                    flex-direction: column;
-                    gap: 2px;
-
-                    .tooltip-tag-image {
-                        width: 40px;
-                        height: 40px;
-                    }
-                }
-
-                .tooltip-tag-label {
-                    font-weight: bold;
-                    text-align: center;
-                }
-
-                .tooltip-tag-description {
-                    display: flex;
-                    flex-wrap: wrap;
-                }
-            }
-        }
-
         .spaced {
             margin-bottom: 4px;
         }
diff --git a/system.json b/system.json
index 14a4efc8..c58be61d 100644
--- a/system.json
+++ b/system.json
@@ -2,7 +2,7 @@
     "id": "daggerheart",
     "title": "Daggerheart",
     "description": "An unofficial implementation of the Daggerheart system",
-    "version": "1.3.2",
+    "version": "1.4.0",
     "compatibility": {
         "minimum": "13.346",
         "verified": "13.351",
@@ -19,7 +19,10 @@
             "discord": "cptn_cosmo"
         },
         {
-            "name": "Ikraik"
+            "name": "Ikraik",
+            "url": "https://github.com/ikraik",
+            "email": "ikraik0.0gaming@gmail.com",
+            "discord": "ikraik"
         },
         {
             "name": "IrkTheImp"
diff --git a/templates/dialogs/dice-roll/header.hbs b/templates/dialogs/dice-roll/header.hbs
index b2ca18cd..21967655 100644
--- a/templates/dialogs/dice-roll/header.hbs
+++ b/templates/dialogs/dice-roll/header.hbs
@@ -2,7 +2,7 @@
     <div class="dialog-header-inner">
         <h1>
             {{#if reactionOverride}}
-                {{localize "DAGGERHEART.CONFIG.ActionType.reaction"}}
+                {{localize "DAGGERHEART.CONFIG.FeatureForm.reaction"}}
             {{else}}
                 {{ifThen rollConfig.headerTitle rollConfig.headerTitle rollConfig.title}}
             {{/if}}
diff --git a/templates/dialogs/item-transfer.hbs b/templates/dialogs/item-transfer.hbs
index 2b9fa19c..0e7df3dc 100644
--- a/templates/dialogs/item-transfer.hbs
+++ b/templates/dialogs/item-transfer.hbs
@@ -1,9 +1,26 @@
-<div>
-    <div class="item-transfer-container">
-        <input type="range" step="1" min="0" max="{{item.system.quantity}}" name="quantity" value="{{quantity}}" />
-        <input type="text" value="{{quantity}}" class="number-display" />
+<div class="dialog-content standard-form">
+    <div class="summary">
+        <img class="actor-img" src="{{originActor.img}}" />
+        <div class="granted-item">
+            {{#if itemImage}}
+                <img src="{{itemImage}}" />
+            {{else}}
+                <i inert class="currency-icon {{currencyIcon}}"></i>
+            {{/if}}
+            <i inert class="fa-solid fa-hand-holding"></i>
+        </div>
+        <img class="actor-img" src="{{targetActor.img}}" />
     </div>
-    <footer class="item-sheet-footer">
-        <button type="button" data-action="finish">{{localize "DAGGERHEART.APPLICATIONS.ItemTransfer.transfer"}}</button>
-    </footer>
+    <div class="form-group">
+        <label>{{localize "DAGGERHEART.GENERAL.quantity"}}</label>
+        <div class="form-fields">
+            <range-picker step="1" min="1" max="{{max}}" name="quantity" value="{{max}}"></range-picker>
+        </div>
+    </div>
+</div>
+<div class="dialog-buttons">
+    <button type="button" data-action="finish">
+        <i inert class="fa-solid fa-gift"></i>
+        {{localize "DAGGERHEART.APPLICATIONS.ItemTransfer.transfer"}}
+    </button>
 </div>
\ No newline at end of file
diff --git a/templates/dialogs/ownershipSelection.hbs b/templates/dialogs/ownershipSelection.hbs
index b16e5d75..ccd90cdf 100644
--- a/templates/dialogs/ownershipSelection.hbs
+++ b/templates/dialogs/ownershipSelection.hbs
@@ -1,23 +1,19 @@
 <div class="ownership-outer-container">
-    <div class="form-group">
-        <div class="form-fields">
-            <label>{{localize "DAGGERHEART.APPLICATIONS.OwnershipSelection.default"}}</label>
-            <select name="default" data-dtype="Number" disabled>
-                {{selectOptions ownershipDefaultOptions selected=defaultOwnership labelAttr="label" valueAttr="value" localize=true }}
-            </select>
-        </div>
-    </div>
-    <ul class="ownership-list">
-        {{#each ownership as |player id|}}
-            <li class="ownership-container">
-                <img src="{{player.img}}" />
-                <span>{{player.name}}</span>
-                <select name="{{concat "ownership." id}}" data-dtype="Number">
-                    {{selectOptions @root.ownershipOptions selected=player.ownership  labelAttr="label" valueAttr="value" localize=true }}
-                </select>
-            </li>
-        {{/each}}
-    </ul>
+    {{#if showOwnership}}
+        <ul class="ownership-list">
+            {{#each ownership as |player id|}}
+                <li class="ownership-container">
+                    <img src="{{player.img}}" />
+                    <span>{{player.name}}</span>
+                    <select name="{{concat "ownership." id}}" data-dtype="Number">
+                        {{selectOptions @root.ownershipOptions selected=player.ownership  labelAttr="label" valueAttr="value" localize=true }}
+                    </select>
+                </li>
+            {{/each}}
+        </ul>
+    {{else}}
+        <span class="hint">{{localize "DAGGERHEART.APPLICATIONS.OwnershipSelection.noPlayers"}}</span>
+    {{/if}}
     <footer class="flexrow">
         <button type="submit">{{localize "Save"}}</button>
     </footer>
diff --git a/templates/settings/homebrew-settings/settings.hbs b/templates/settings/homebrew-settings/settings.hbs
index e7340323..5da053f4 100644
--- a/templates/settings/homebrew-settings/settings.hbs
+++ b/templates/settings/homebrew-settings/settings.hbs
@@ -25,6 +25,20 @@
             {{/each}}
         </fieldset>
 
+        <fieldset class="three-columns">
+            <legend>
+                {{localize "Token Sizes"}} 
+                <a data-action="resetTokenSizes"><i class="fa-solid fa-arrow-rotate-left"></i></a>
+            </legend>
+
+            {{formGroup settingFields.schema.fields.tokenSizes.fields.tiny value=settingFields._source.tokenSizes.tiny localize=true}}
+            {{formGroup settingFields.schema.fields.tokenSizes.fields.small value=settingFields._source.tokenSizes.small localize=true}}
+            {{formGroup settingFields.schema.fields.tokenSizes.fields.medium value=settingFields._source.tokenSizes.medium localize=true}}
+            {{formGroup settingFields.schema.fields.tokenSizes.fields.large value=settingFields._source.tokenSizes.large localize=true}}
+            {{formGroup settingFields.schema.fields.tokenSizes.fields.huge value=settingFields._source.tokenSizes.huge localize=true}}
+            {{formGroup settingFields.schema.fields.tokenSizes.fields.gargantuan value=settingFields._source.tokenSizes.gargantuan localize=true}}
+        </fieldset>
+
         <fieldset>
             <legend>
                 {{localize "DAGGERHEART.SETTINGS.Homebrew.currency.title"}} 
diff --git a/templates/sheets-settings/action-settings/base.hbs b/templates/sheets-settings/action-settings/base.hbs
index 69b5dfce..65010903 100644
--- a/templates/sheets-settings/action-settings/base.hbs
+++ b/templates/sheets-settings/action-settings/base.hbs
@@ -7,7 +7,6 @@
         <legend>{{localize "DAGGERHEART.GENERAL.identify"}}</legend>
         {{formField fields.name value=source.name label="Name" name="name"}}
         {{formField fields.img value=source.img label="Icon" name="img"}}
-        {{formField fields.actionType value=source.actionType label="Type" name="actionType" localize=true}}
         {{formField fields.chatDisplay value=source.chatDisplay name="chatDisplay" classes="checkbox" localize=true}}
     </fieldset>
     <fieldset class="action-category">
diff --git a/templates/sheets-settings/adversary-settings/details.hbs b/templates/sheets-settings/adversary-settings/details.hbs
index 194c7f0c..065ebe74 100644
--- a/templates/sheets-settings/adversary-settings/details.hbs
+++ b/templates/sheets-settings/adversary-settings/details.hbs
@@ -13,6 +13,7 @@
             {{/if}}
             {{formGroup systemFields.difficulty value=document._source.system.difficulty localize=true}}
         </div>
+        {{formGroup systemFields.size value=document._source.system.size label=(localize "DAGGERHEART.GENERAL.tokenSize") localize=true}}
         {{formField systemFields.description value=document._source.system.description label=(localize "DAGGERHEART.ACTORS.Adversary.FIELDS.description.label")}}
         {{formField systemFields.motivesAndTactics value=document._source.system.motivesAndTactics label=(localize "DAGGERHEART.ACTORS.Adversary.FIELDS.motivesAndTactics.label")}}
     </fieldset>
@@ -21,12 +22,12 @@
         <fieldset class="flex">
             <legend>{{localize "DAGGERHEART.GENERAL.HitPoints.plural"}}</legend>
             {{formGroup systemFields.resources.fields.hitPoints.fields.value value=document._source.system.resources.hitPoints.value label=(localize "DAGGERHEART.ACTORS.Adversary.FIELDS.resources.hitPoints.value.label")}}
-            {{formGroup systemFields.resources.fields.hitPoints.fields.max value=document._source.system.resources.hitPoints.max}}
+            {{formGroup systemFields.resources.fields.hitPoints.fields.max value=document._source.system.resources.hitPoints.max label=(localize "DAGGERHEART.ACTORS.Adversary.FIELDS.resources.hitPoints.max.label")}}
         </fieldset>
         <fieldset class="flex">
             <legend>{{localize "DAGGERHEART.GENERAL.stress"}}</legend>
             {{formGroup systemFields.resources.fields.stress.fields.value value=document._source.system.resources.stress.value label=(localize "DAGGERHEART.ACTORS.Adversary.FIELDS.resources.stress.value.label")}}
-            {{formGroup systemFields.resources.fields.stress.fields.max value=document._source.system.resources.stress.max}}
+            {{formGroup systemFields.resources.fields.stress.fields.max value=document._source.system.resources.stress.max label=(localize "DAGGERHEART.ACTORS.Adversary.FIELDS.resources.stress.max.label")}}
         </fieldset>
     </div>
 
diff --git a/templates/sheets-settings/adversary-settings/features.hbs b/templates/sheets-settings/adversary-settings/features.hbs
index ec6a9e54..bc6a1ddf 100644
--- a/templates/sheets-settings/adversary-settings/features.hbs
+++ b/templates/sheets-settings/adversary-settings/features.hbs
@@ -16,7 +16,7 @@
                         <span>{{feature.name}}</span>
                     </div>
                     <div class="controls">
-                        <a data-action="editDoc" data-item-uuid="{{feature.uuid}}" data-tooltip="{{localize 'DAGGERHEART.CommonEdit'}}"><i class="fa-solid fa-pen-to-square"></i></a>
+                        <a data-action="editDoc" data-item-uuid="{{feature.uuid}}" data-tooltip="{{localize 'CONTROLS.CommonEdit'}}"><i class="fa-solid fa-pen-to-square"></i></a>
                         <a data-action="deleteDoc"  data-item-uuid="{{feature.uuid}}" data-tooltip="{{localize 'CONTROLS.CommonDelete'}}"><i class="fa-solid fa-trash"></i></a>
                     </div>
                 </li>
diff --git a/templates/sheets-settings/token-config/appearance.hbs b/templates/sheets-settings/token-config/appearance.hbs
new file mode 100644
index 00000000..0f6019ba
--- /dev/null
+++ b/templates/sheets-settings/token-config/appearance.hbs
@@ -0,0 +1,82 @@
+<div class="tab scrollable{{#if tab.active}} active{{/if}}" data-group="{{tab.group}}" data-tab="{{tab.id}}">
+    {{formGroup fields.texture.fields.src value=source.texture.src rootId=rootId}}
+    {{#if randomImgEnabled}}
+    {{formGroup fields.randomImg value=source.randomImg classes="slim" rootId=rootId}}
+    {{else if hasAlternates}}
+    <div class="form-group">
+        <label for="{{rootId}}-alternateImages">{{localize "TOKEN.ImageAlts"}}</label>
+        <select id="{{rootId}}-alternateImages" class="alternate-images" name="alternateImages">
+            {{selectOptions alternateImages selected=source.texture.src blank=""}}
+        </select>
+    </div>
+    {{/if}}
+
+
+    <div class="form-group slim" {{#if actorSizeUsed}}data-tooltip="{{localize "DAGGERHEART.APPLICATIONS.TokenConfig.actorSizeUsed"}}"{{/if}}>
+        <label>
+            {{localize "TOKEN.Dimensions"}} <span class="units">({{localize "GridSpaces"}})</span>
+            {{#if actorSizeUsed}}
+                <i class="fa-solid fa-lock"></i>
+            {{/if}}
+        </label>
+        <div class="form-fields">
+            <label for="{{rootId}}-width">{{localize "DOCUMENT.FIELDS.width.label"}}</label>
+            {{formInput fields.width value=source.width id=(concat rootId "-width") disabled=actorSizeUsed}}
+            <label for="{{rootId}}-height">{{localize "DOCUMENT.FIELDS.height.label"}}</label>
+            {{formInput fields.height value=source.height id=(concat rootId "-height") disabled=actorSizeUsed}}
+        </div>
+    </div>
+
+    {{#if shapes}}
+    {{formGroup fields.shape value=source.shape choices=shapes classes="slim" rootId=rootId}}
+    {{/if}}
+    {{formGroup fields.texture.fields.fit value=source.texture.fit choices=textureFitModes classes="slim" rootId=rootId}}
+
+    <div class="form-group slim">
+        <label>{{localize "Anchor"}}</label>
+        <div class="form-fields">
+            <label for="{{rootId}}-anchorX">{{localize "TOKEN.FIELDS.texture.anchorX.label"}}</label>
+            {{formInput fields.texture.fields.anchorX value=source.texture.anchorX id=(concat rootId "-anchorX")
+                placeholder="0.5"}}
+            <label for="{{rootId}}-anchorY">{{localize "TOKEN.FIELDS.texture.anchorY.label"}}</label>
+            {{formInput fields.texture.fields.anchorY value=source.texture.anchorY id=(concat rootId "-anchorY")
+                placeholder="0.5"}}
+        </div>
+        <p class="hint">{{localize "TOKEN.AnchorHint"}}</p>
+    </div>
+
+    <div class="form-group">
+        <label for="{{rootId}}-scale">{{localize "Scale"}} <span class="units">({{localize "Ratio"}})</span></label>
+        <div class="form-fields">
+            <range-picker id="{{rootId}}-scale" name="scale" value={{scale}} min="0.2" max="3" step="0.05"></range-picker>
+        </div>
+    </div>
+
+    <div class="form-group slim">
+        <label>{{localize "TOKEN.Mirror"}}</label>
+        <div class="form-fields">
+            <label class="checkbox" for="{{rootId}}-mirrorX">
+                {{localize "TOKEN.MirrorX"}}
+                <input type="checkbox" id="{{rootId}}-mirrorX" name="mirrorX" {{checked mirrorX}}>
+            </label>
+            <label class="checkbox" for="{{rootId}}-mirrorY">
+                {{localize "TOKEN.MirrorY"}}
+                <input type="checkbox" id="{{rootId}}-mirrorY" name="mirrorY" {{checked mirrorY}}>
+            </label>
+        </div>
+    </div>
+
+    {{formGroup fields.texture.fields.tint value=source.texture.tint placeholder="#ffffff" rootId=rootId}}
+    {{formGroup fields.alpha value=source.alpha step=0.05 rootId=rootId}}
+    {{formGroup fields.lockRotation value=source.lockRotation rootId=rootId}}
+
+    <fieldset>
+        <legend>{{localize "TOKEN.RING.SHEET.legend"}}</legend>
+        {{formGroup fields.ring.fields.enabled value=source.ring.enabled rootId=rootId}}
+        {{formGroup fields.ring.fields.colors.fields.ring value=source.ring.colors.ring rootId=rootId}}
+        {{formGroup fields.ring.fields.colors.fields.background value=source.ring.colors.background rootId=rootId}}
+        {{formGroup fields.ring.fields.subject.fields.texture value=source.ring.subject.texture rootId=rootId}}
+        {{formGroup fields.ring.fields.subject.fields.scale value=source.ring.subject.scale max=3 step=0.02 rootId=rootId}}
+        {{formGroup fields.ring.fields.effects value=source.ring.effects input=ringEffectsInput stacked=true rootId=rootId}}
+    </fieldset>
+</div>
diff --git a/templates/sheets/actors/adversary/header.hbs b/templates/sheets/actors/adversary/header.hbs
index e6f829b8..5bdfa421 100644
--- a/templates/sheets/actors/adversary/header.hbs
+++ b/templates/sheets/actors/adversary/header.hbs
@@ -1,10 +1,7 @@
 <header class='adversary-header-sheet'>
     <line-div></line-div>
     <div class="name-row">
-        <h1 class='actor-name'>
-            <input type='text' name='name' value='{{source.name}}' placeholder="{{localize "DAGGERHEART.GENERAL.actorName"}}"
-            />
-        </h1>
+        <h1 class='input actor-name' contenteditable="plaintext-only" data-property="name" placeholder="{{localize "DAGGERHEART.GENERAL.actorName"}}">{{source.name}}</h1>
     </div>
     <div class="tags">
         <div class="tag">
@@ -21,6 +18,14 @@
                 <span>/{{localize "DAGGERHEART.GENERAL.HitPoints.short"}}</span>
             </div>
         {{/if}}
+        <div class="tag" data-tooltip="DAGGERHEART.UI.Tooltip.tokenSize">
+            <i class="fa-solid fa-circle-user"></i>
+            {{#unless (eq source.system.size 'custom')}}
+                <span>{{localize (concat "DAGGERHEART.CONFIG.TokenSize." source.system.size)}}</span>
+            {{else}}
+                <span>{{source.prototypeToken.width}}x{{source.prototypeToken.height}}</span>
+            {{/unless}}
+        </div>
     </div>
     <line-div></line-div>
     <div class="adversary-info">
diff --git a/templates/sheets/actors/character/header.hbs b/templates/sheets/actors/character/header.hbs
index e19c1dea..be3557ff 100644
--- a/templates/sheets/actors/character/header.hbs
+++ b/templates/sheets/actors/character/header.hbs
@@ -1,15 +1,7 @@
 <header class="character-header-sheet">
     <line-div></line-div>
     <div class="name-row">
-        <h1 class='actor-name'>
-            <input
-                type='text'
-                name='name'
-                value='{{document.name}}'
-                placeholder='{{localize "DAGGERHEART.GENERAL.actorName"}}'
-            />
-        </h1>
-
+        <h1 class="actor-name input" contenteditable="plaintext-only" data-property="name" placeholder="{{localize "DAGGERHEART.GENERAL.actorName"}}">{{source.name}}</h1>
         <div class='level-div'>
             <h3 class='label'>
                 {{#if (or document.system.needsCharacterSetup document.system.levelData.canLevelUp)}}
diff --git a/templates/sheets/actors/character/inventory.hbs b/templates/sheets/actors/character/inventory.hbs
index f9dee872..a05fed35 100644
--- a/templates/sheets/actors/character/inventory.hbs
+++ b/templates/sheets/actors/character/inventory.hbs
@@ -14,10 +14,10 @@
 
     {{#if this.inventory.hasCurrency}}
         <div class="currency-section">
-            {{#each this.inventory.currencies as | currency |}}
+            {{#each this.inventory.currencies as |currency key|}}
                 {{#if currency.enabled}}
-                    <div class="input">
-                        <span>
+                    <div class="input currency" data-currency="{{key}}">
+                        <span class="drag-handle">
                             <i class="{{currency.icon}}" inert></i> {{localize currency.label}}
                         </span>
                         <input type="text" name="{{currency.field.fieldPath}}" data-allow-delta value="{{currency.value}}" data-dtype="Number" min="0" step="1" />
diff --git a/templates/sheets/actors/character/sidebar.hbs b/templates/sheets/actors/character/sidebar.hbs
index 7f470b0a..0db2bf42 100644
--- a/templates/sheets/actors/character/sidebar.hbs
+++ b/templates/sheets/actors/character/sidebar.hbs
@@ -147,7 +147,7 @@
                         <span class="experience-value">
                             +{{experience.value}}
                         </span>
-                        <span>{{experience.name}}</span>
+                        <span class="experience-name">{{experience.name}}</span>
                         <div class="controls">
                             <a data-action="sendExpToChat" data-type="experience" data-id="{{id}}">
                                 <i class="fa-regular fa-message"></i>
diff --git a/templates/sheets/actors/party/inventory.hbs b/templates/sheets/actors/party/inventory.hbs
index 09f3ba62..92371b8d 100644
--- a/templates/sheets/actors/party/inventory.hbs
+++ b/templates/sheets/actors/party/inventory.hbs
@@ -17,10 +17,10 @@
 
     {{#if inventory.hasCurrency}}
         <div class="currency-section">
-            {{#each this.inventory.currencies as | currency |}}
+            {{#each this.inventory.currencies as |currency key|}}
                 {{#if currency.enabled}}
-                    <div class="input">
-                        <span>
+                    <div class="input currency" data-currency="{{key}}">
+                        <span class="drag-handle">
                             <i class="{{currency.icon}}" inert></i> {{localize currency.label}}
                         </span>
                         <input type="text" name="{{currency.field.fieldPath}}" data-allow-delta value="{{currency.value}}" data-dtype="Number" min="0" step="1" />
diff --git a/templates/sheets/global/partials/inventory-item-V2.hbs b/templates/sheets/global/partials/inventory-item-V2.hbs
index cd9626e3..dbacd1e4 100644
--- a/templates/sheets/global/partials/inventory-item-V2.hbs
+++ b/templates/sheets/global/partials/inventory-item-V2.hbs
@@ -18,12 +18,12 @@ Parameters:
 --}}
 
 <li class="inventory-item" data-item-id="{{item.id}}" {{#if (or (eq type 'action' ) (eq type 'attack' ))}}
-  data-action-id="{{item.id}}" {{/if}} data-item-uuid="{{item.uuid}}" data-type="{{type}}" data-no-compendium-edit="{{noCompendiumEdit}}" draggable="true">
+  data-action-id="{{item.id}}" {{/if}} data-item-uuid="{{item.uuid}}" data-type="{{type}}" data-no-compendium-edit="{{noCompendiumEdit}}">
   <div class="inventory-item-header {{#if hideContextMenu}}padded{{/if}}" {{#unless noExtensible}}data-action="toggleExtended" {{/unless}}>
     {{!-- Image --}}
     <div class="img-portait" data-action='{{ifThen (or (hasProperty item "use") (eq type "attack")) "useItem" (ifThen
       (hasProperty item "toChat" ) "toChat" "editDoc" ) }}' {{#unless hideTooltip}} {{#if (eq type 'attack' )}}
-      data-tooltip="#attack#{{item.actor.uuid}}" {{else}} data-tooltip="#item#{{item.uuid}}" {{/if}} {{/unless}}>
+      data-tooltip="#attack#{{item.actor.uuid}}" {{else}} data-tooltip="#item#{{item.uuid}}" {{/if}} {{/unless}} draggable="true">
       <img src="{{item.img}}" class="item-img {{#if isActor}}actor-img{{/if}}" />
       {{#if (or item.system.actionsList.size item.system.actionsList.length item.actionType)}}
         {{#if @root.isNPC}}
@@ -35,7 +35,7 @@ Parameters:
     </div>
 
     {{!-- Name & Tags --}}
-    <div class="item-label">
+    <div class="item-label" draggable="true">
 
       {{!-- Item Name --}}
       <span class="item-name">{{localize item.name}} {{#unless (or noExtensible (not item.system.description))}}<span class="expanded-icon"><i class="fa-solid fa-expand"></i></span>{{/unless}}</span>
@@ -49,6 +49,19 @@ Parameters:
           {{tag}}
         </div>
         {{/each}}
+
+        {{!-- Feature Form Tag Start --}}
+        {{#if (eq ../type 'feature')}}
+            {{#if (or (eq @root.document.type 'adversary') (eq @root.document.type 'environment'))}}
+                {{#if system.featureForm}}
+                    <div class="tag feature-form">
+                        <span class="recall-value">{{localize (concat "DAGGERHEART.CONFIG.FeatureForm." system.featureForm)}}</span>
+                    </div>
+                {{/if}}
+            {{/if}}
+        {{/if}}
+        {{!-- Feature Form Tag End --}}
+
       </div>
       {{/if}}
       {{/with}}
@@ -61,7 +74,7 @@ Parameters:
     {{/if}}
     {{#if (and (not hideResources) (gte item.system.quantity 0))}}
     <div class="item-resource">
-      <input type="number" class="inventory-item-quantity" value="{{item.system.quantity}}" min="0" />
+      <input type="number" id="{{item.uuid}}-quantity" class="inventory-item-quantity" value="{{item.system.quantity}}" min="0" />
     </div>
     {{/if}}
 
@@ -145,10 +158,12 @@ Parameters:
     <div class="item-button">
         {{#if (and (eq action.type 'beastform') @root.beastformActive)}}
           <button type="button" data-action="cancelBeastform" data-item-uuid="{{action.uuid}}">
+            <i class="fa-solid {{action.typeIcon}} action-icon"></i>
             {{localize "DAGGERHEART.ACTORS.Character.cancelBeastform"}}
           </button>
         {{else}}
           <button type="button" data-action="useItem" data-item-uuid="{{action.uuid}}">
+            <i class="fa-solid {{action.typeIcon}} action-icon"></i>
             {{action.name}}
           </button>
         {{/if}}
diff --git a/templates/sheets/global/partials/inventory-item.hbs b/templates/sheets/global/partials/inventory-item.hbs
index b239e226..c2b2a241 100644
--- a/templates/sheets/global/partials/inventory-item.hbs
+++ b/templates/sheets/global/partials/inventory-item.hbs
@@ -67,6 +67,21 @@
                     </div>
                 {{/if}}
             {{/if}}
+
+<!-- Feature Form Tags for adversary/environment actors -->
+            {{#if (eq type 'feature')}}
+                {{#if (or (eq @root.document.type 'adversary') (eq @root.document.type 'environment'))}}
+                    {{#if item.system.featureForm}}
+                        <div class="item-tags">
+                            <div class="tag">
+                                <span class="recall-label">{{localize "DAGGERHEART.CONFIG.FeatureForm.label"}}: </span>
+                                <span class="recall-value">{{localize (concat "DAGGERHEART.CONFIG.FeatureForm." item.system.featureForm)}}</span>
+                            </div>
+                        </div>
+                    {{/if}}
+                {{/if}}
+            {{/if}}
+
             {{#if  (eq type 'domainCard')}}
                 {{#if isSidebar}}
                     <div class="item-labels">
@@ -121,7 +136,7 @@
                         {{localize (concat 'DAGGERHEART.ACTIONS.TYPES.' item.type '.name')}}
                     </div>
                     <div class="tag">
-                        {{localize (concat 'DAGGERHEART.CONFIG.ActionType.' item.actionType)}}
+                        {{localize (concat 'DAGGERHEART.CONFIG.FeatureForm.' item.actionType)}}
                     </div>
                 </div>
             {{/if}}
@@ -131,7 +146,7 @@
                         {{localize 'DAGGERHEART.GENERAL.unarmed'}}
                     </div>
                     <div class="tag">
-                        {{localize 'DAGGERHEART.CONFIG.ActionType.action'}}
+                        {{localize 'DAGGERHEART.CONFIG.FeatureForm.action'}}
                     </div>
                 </div>
             {{/if}}
diff --git a/templates/sheets/global/partials/item-resource.hbs b/templates/sheets/global/partials/item-resource.hbs
index def153ea..fbcf02ca 100644
--- a/templates/sheets/global/partials/item-resource.hbs
+++ b/templates/sheets/global/partials/item-resource.hbs
@@ -1,7 +1,7 @@
 {{#if (eq item.system.resource.type 'simple')}}
     <div class="item-resource">
         <i class="{{#if item.system.resource.icon}}{{item.system.resource.icon}}{{else}}fa-solid fa-hashtag{{/if}}"></i>
-        <input type="number" class="inventory-item-resource" value="{{item.system.resource.value}}" min="0" max="{{rollParsed item.system.resource.max item.actor item true}}" />
+        <input type="number" id="{{item.uuid}}-resource" class="inventory-item-resource" value="{{item.system.resource.value}}" min="0" max="{{rollParsed item.system.resource.max item.actor item true}}" />
     </div>
 {{else if (eq item.system.resource.type 'diceValue')}}
     <div class="item-resources">
diff --git a/templates/sheets/items/beastform/settings.hbs b/templates/sheets/items/beastform/settings.hbs
index c0ea3965..844b9d61 100644
--- a/templates/sheets/items/beastform/settings.hbs
+++ b/templates/sheets/items/beastform/settings.hbs
@@ -20,18 +20,35 @@
         {{/unless}}
     {{/if}}
 
-    <fieldset class="two-columns even">
+    <fieldset>
         <legend>{{localize "DAGGERHEART.ITEMS.Beastform.tokenTitle"}}</legend>
+        {{#unless (eq source.system.beastformType 'evolved')}}
+            <div class="full-width">
+                {{formGroup systemFields.tokenImg value=source.system.tokenImg localize=true}}
+            </div>
 
-        <div class="full-width">
-            {{formGroup systemFields.tokenImg value=source.system.tokenImg localize=true}}
-        </div>
-
-        <div class="full-width">
-            {{formGroup systemFields.tokenRingImg value=source.system.tokenRingImg localize=true}}
-        </div>
-
-        {{formGroup systemFields.tokenSize.fields.height value=source.system.tokenSize.height localize=true placeholder=(localize "DAGGERHEART.ITEMS.Beastform.FIELDS.tokenSize.placeholder") }}
-        {{formGroup systemFields.tokenSize.fields.width value=source.system.tokenSize.width localize=true placeholder=(localize "DAGGERHEART.ITEMS.Beastform.FIELDS.tokenSize.placeholder")}}
+            <div class="full-width">
+                {{formGroup systemFields.tokenRingImg value=source.system.tokenRingImg localize=true}}
+            </div>
+            <div class="nest-inputs">
+                {{formGroup systemFields.tokenSize.fields.size value=source.system.tokenSize.size label=(localize "DAGGERHEART.GENERAL.tokenSize") localize=true }}
+                {{formGroup 
+                    systemFields.tokenSize.fields.height 
+                    value=source.system.tokenSize.height 
+                    localize=true 
+                    placeholder=(localize (ifThen dimensionsDisabled "DAGGERHEART.ITEMS.Beastform.FIELDS.tokenSize.disabledPlaceholder" "DAGGERHEART.ITEMS.Beastform.FIELDS.tokenSize.placeholder")) 
+                    disabled=dimensionsDisabled 
+                }}
+                {{formGroup 
+                    systemFields.tokenSize.fields.width 
+                    value=source.system.tokenSize.width 
+                    localize=true 
+                    placeholder=(localize (ifThen dimensionsDisabled "DAGGERHEART.ITEMS.Beastform.FIELDS.tokenSize.disabledPlaceholder" "DAGGERHEART.ITEMS.Beastform.FIELDS.tokenSize.placeholder")) 
+                    disabled=dimensionsDisabled 
+                }}
+            </div>
+        {{else}}
+            <span class="hint">{{localize "DAGGERHEART.ITEMS.Beastform.evolvedTokenHint"}}</span>
+        {{/unless}}
     </fieldset>
 </section>
\ No newline at end of file
diff --git a/templates/sheets/items/feature/header.hbs b/templates/sheets/items/feature/header.hbs
index e603c0f7..efaba77b 100755
--- a/templates/sheets/items/feature/header.hbs
+++ b/templates/sheets/items/feature/header.hbs
@@ -4,7 +4,7 @@
         <line-div></line-div>
         <h1 class='item-name'><input type='text' name='name' value='{{source.name}}' /></h1>
         <div class='item-description'>
-            <h3>{{localize 'TYPES.Item.feature'}}</h3>
+            <h3>{{localize (concat 'DAGGERHEART.CONFIG.FeatureForm.' source.system.featureForm)}} {{localize 'TYPES.Item.feature'}}</h3>
         </div>
     </div>
 </header>
\ No newline at end of file
diff --git a/templates/sheets/items/feature/settings.hbs b/templates/sheets/items/feature/settings.hbs
index c2ecb3fe..63aa9502 100644
--- a/templates/sheets/items/feature/settings.hbs
+++ b/templates/sheets/items/feature/settings.hbs
@@ -3,5 +3,12 @@
     data-tab='{{tabs.settings.id}}'
     data-group='{{tabs.settings.group}}'
 >
+    {{#if (or (eq document.parent.type "adversary") (eq document.parent.type "environment"))}}
+        <fieldset class="two-columns">
+            <legend>{{localize "DAGGERHEART.GENERAL.general"}}</legend>
+            <span>{{localize "DAGGERHEART.CONFIG.FeatureForm.label"}}</span>
+            {{formInput document.system.schema.fields.featureForm value=document.system.featureForm choices=featureFormChoices localize=true}}
+        </fieldset>
+    {{/if}}
     {{> "systems/daggerheart/templates/sheets/global/partials/resource-section/resource-section.hbs" }}
 </section>
\ No newline at end of file
diff --git a/templates/ui/chat/parts/target-part.hbs b/templates/ui/chat/parts/target-part.hbs
index 7c777fdb..477445a3 100644
--- a/templates/ui/chat/parts/target-part.hbs
+++ b/templates/ui/chat/parts/target-part.hbs
@@ -29,7 +29,7 @@
                     <div class="roll-target" data-token="{{id}}">
                         <img class="target-img" src="{{img}}">
                         <div class="target-data">
-                            <div class="target-name" data-perm-id="{{actorId}}"><span>{{name}}</span></div>
+                            <div class="target-name"><span>{{name}}</span></div>
                             {{#if (and ../hasRoll (hasProperty this "hit"))}}
                                 <div class="target-hit-status {{#if hit}}is-hit{{else}}is-miss{{/if}}" data-perm-id="{{actorId}}" data-perm-hidden="true">
                                     {{#if hit}}
diff --git a/templates/ui/tooltip/action.hbs b/templates/ui/tooltip/action.hbs
index a3020aff..29d44dde 100644
--- a/templates/ui/tooltip/action.hbs
+++ b/templates/ui/tooltip/action.hbs
@@ -1,82 +1,67 @@
-<div class="daggerheart dh-style tooltip">
-    <h2 class="tooltip-title">{{localize item.name}}</h2>
+<div class="daggerheart dh-style tooltip card-style">
     <img class="tooltip-image" src="{{item.img}}" />
-    <div class="tooltip-description">{{{description}}}</div>
-    {{#if item.uses.max}}
-        <h4 class="tooltip-sub-title">{{localize "DAGGERHEART.GENERAL.uses"}}</h4>
-        <div class="tooltip-information-section triple spaced">
-            <div class="tooltip-information">
-                <label>{{localize "DAGGERHEART.GENERAL.used"}}</label>
-                <div>{{item.uses.value}}</div>
+    <h2 class="tooltip-title">{{localize item.name}}</h2>
+    <div class="tags">
+        {{#if item.uses.max}}
+            <div class="tag">
+              <span>{{localize "DAGGERHEART.GENERAL.used"}} {{item.uses.value}}</span>
             </div>
-            <div class="tooltip-information">
-                <label>{{localize "DAGGERHEART.GENERAL.max"}}</label>
-                <div>{{formulaValue item.uses.max item}}</div>
+            <div class="tag">
+              <span>{{localize "DAGGERHEART.GENERAL.max"}} {{formulaValue item.uses.max item}}</span>
             </div>
-            <div class="tooltip-information">
-                <label>{{localize "DAGGERHEART.GENERAL.recovery"}}</label>
-                {{#with (lookup config.GENERAL.refreshTypes item.uses.recovery) as | type |}}
-                    <div>{{localize type.label}}</div>
-                {{/with}}
+            <div class="tag">
+              <span>{{localize "DAGGERHEART.GENERAL.recovery"}} {{#with (lookup config.GENERAL.refreshTypes item.uses.recovery) as | type |}}{{localize type.label}}{{/with}}</span>
             </div>
-        </div>
-    {{/if}}
-
-    {{#if (gt item.cost.length 0)}}
-        <h4 class="tooltip-sub-title">{{localize "DAGGERHEART.GENERAL.Cost.plural"}}</h4>
-        {{#each item.cost as | cost |}}
-            <div class="tooltip-information-section border spaced">
-                <div class="tooltip-information">
-                    <label>{{localize "Type"}}</label>
-                    {{#with (lookup @root.config.GENERAL.abilityCosts cost.type) as | type |}}
-                        <div>{{localize type.label}}</div>
-                    {{/with}}
+        {{/if}}
+        {{#if (gt item.cost.length 0)}}
+            {{#each item.cost as | cost |}}
+                <div class="tag">
+                  <span>{{localize "Type"}} {{#with (lookup @root.config.GENERAL.abilityCosts cost.type) as | type |}}{{localize type.label}}{{/with}}</span>
                 </div>
-                <div class="tooltip-information">
-                    <label>{{localize "DAGGERHEART.GENERAL.value"}}</label>
-                    <div>{{cost.value}}</div>
+                <div class="tag">
+                  <span>{{localize "DAGGERHEART.GENERAL.value"}} {{cost.value}}</span>
                 </div>
                 {{#if cost.scalable}}
-                    <div class="tooltip-information">
-                        <label>{{localize "DAGGERHEART.GENERAL.scalable"}}</label>
-                        <div>{{localize "DAGGERHEART.GENERAL.true"}}</div>
-                    </div>
-                    <div class="tooltip-information">
-                        <label>{{localize "DAGGERHEART.GENERAL.value"}}</label>
-                        <div>{{cost.step}}</div>
-                    </div>
+                  <div class="tag">
+                    <span>{{localize "DAGGERHEART.GENERAL.scalable"}} {{localize "DAGGERHEART.GENERAL.true"}}</span>
+                  </div>
+                  <div class="tag">
+                    <span>{{localize "DAGGERHEART.GENERAL.step"}} {{cost.step}}</span>
+                  </div>
                 {{/if}}
+            {{/each}}
+        {{/if}}
+        {{#if (or item.range item.target)}}
+            <div class="tag">
+              <span>
+                  {{localize "DAGGERHEART.GENERAL.range"}} 
+                  {{#if item.range}}
+                      {{#with (lookup @root.config.GENERAL.range item.range) as | range |}}
+                          {{localize range.label}}
+                      {{/with}}
+                  {{else}}
+                      {{localize "DAGGERHEART.GENERAL.none"}}
+                  {{/if}}
+              </span>
             </div>
-        {{/each}}
-    {{/if}}
-
-    {{#if (or item.range item.target)}}
-        <h4 class="tooltip-sub-title">{{localize "DAGGERHEART.UI.Tooltip.rangeAndTarget"}}</h4>
-        <div class="tooltip-information-section border spaced">
-            <div class="tooltip-information">
-                <label>{{localize "DAGGERHEART.GENERAL.range"}}</label>
-                <div>
-                    {{#if item.range}}
-                        {{#with (lookup @root.config.GENERAL.range item.range) as | range |}}
-                            <div>{{localize range.label}}</div>
-                        {{/with}}
-                    {{else}}
-                        <div>{{localize "DAGGERHEART.GENERAL.none"}}</div>
-                    {{/if}}
-                </div>
-            </div>
-            <div class="tooltip-information">
-                <label>{{localize "DAGGERHEART.GENERAL.Target.single"}}</label>
-                <div>
-                    {{#if item.target.type}}
-                        {{#with (lookup @root.config.ACTIONS.targetTypes item.target.type) as | target |}}
-                            <div>{{@root.item.target.amount}} {{localize target.label}}</div>
-                        {{/with}}
-                    {{else}}
-                        <div>{{localize "DAGGERHEART.GENERAL.none"}}</div>
-                    {{/if}}
-                </div>
-            </div>
+        {{/if}}
+        <div class="tag">
+          <span>
+              {{localize "DAGGERHEART.GENERAL.Target.single"}} 
+              {{#if item.target.type}}
+                  {{#with (lookup @root.config.ACTIONS.targetTypes item.target.type) as | target |}}
+                      {{@root.item.target.amount}} {{localize target.label}}
+                  {{/with}}
+              {{else}}
+                  {{localize "DAGGERHEART.GENERAL.none"}}
+              {{/if}}
+          </span>
         </div>
+    </div>
+    {{#if description}}
+        <div class="tooltip-description">{{{description}}}</div>
     {{/if}}
+    <p class="tooltip-hint">
+        <i class="fa-solid fa-computer-mouse"></i> {{localize "DAGGERHEART.UI.Tooltip.middleClick"}}
+    </p>
 </div>
\ No newline at end of file
diff --git a/templates/ui/tooltip/armor.hbs b/templates/ui/tooltip/armor.hbs
index b2e07970..95fc20c9 100644
--- a/templates/ui/tooltip/armor.hbs
+++ b/templates/ui/tooltip/armor.hbs
@@ -1,21 +1,22 @@
-<div class="daggerheart dh-style tooltip">
-    <h2 class="tooltip-title">{{item.name}}</h2>
+<div class="daggerheart dh-style tooltip armor card-style">
     <img class="tooltip-image" src="{{item.img}}" />
-    <div class="tooltip-description">{{{description}}}</div>
-
-    <div class="tooltip-information-section">
-        <div class="tooltip-information full-width">
-            <label>{{localize "DAGGERHEART.ITEMS.Armor.baseScore"}}</label>
-            <div>{{item.system.baseScore}}</div>
+    <h2 class="tooltip-title">{{item.name}}</h2>
+    <div class="tags">
+        <div class="tag">
+          <span>{{localize "DAGGERHEART.ITEMS.Armor.baseScore"}} {{item.system.baseScore}}</span>
         </div>
-        
-        <div class="tooltip-information">
-            <label>{{localize "DAGGERHEART.ITEMS.Armor.baseThresholds.major"}}</label>
-            <div>{{item.system.baseThresholds.major}}</div>
+        <div class="tag">
+          <span>{{localize "DAGGERHEART.ITEMS.Armor.baseThresholds.major"}} {{item.system.baseThresholds.major}}</span>
         </div>
-        <div class="tooltip-information">
-            <label>{{localize "DAGGERHEART.ITEMS.Armor.baseThresholds.severe"}}</label>
-            <div>{{item.system.baseThresholds.severe}}</div>
+        <div class="tag">
+          <span>{{localize "DAGGERHEART.ITEMS.Armor.baseThresholds.severe"}} {{item.system.baseThresholds.severe}}</span>
         </div>
     </div>
+    {{#if description}}
+        <div class="tooltip-description">{{{description}}}</div>
+    {{/if}}
+
+    <p class="tooltip-hint">
+        <i class="fa-solid fa-computer-mouse"></i> {{localize "DAGGERHEART.UI.Tooltip.middleClick"}}
+    </p>
 </div>
\ No newline at end of file
diff --git a/templates/ui/tooltip/attack.hbs b/templates/ui/tooltip/attack.hbs
index efd40311..8e4a1bb0 100644
--- a/templates/ui/tooltip/attack.hbs
+++ b/templates/ui/tooltip/attack.hbs
@@ -1,35 +1,36 @@
-<div class="daggerheart dh-style tooltip">
-    <h2 class="tooltip-title">{{attack.name}}</h2>
+<div class="daggerheart dh-style tooltip card-style">
     <img class="tooltip-image" src="{{attack.img}}" />
-    <div class="tooltip-description">{{{description}}}</div>
-
-    <div class="tooltip-information-section spaced">
-
+    <h2 class="tooltip-title">{{localize attack.name}}</h2>
+    <div class="tags">
         {{#if (lookup config.ACTOR.abilities attack.roll.trait)}}
-            <div class="tooltip-information">
-                <label>{{localize "DAGGERHEART.GENERAL.Trait.single"}}</label>
-                {{#with (lookup config.ACTOR.abilities attack.roll.trait) as | trait |}}
-                    <div>{{localize trait.label}}</div>
-                {{/with}}
+            <div class="tag">
+                <span>
+                    {{localize "DAGGERHEART.GENERAL.Trait.single"}}
+                    {{#with (lookup config.ACTOR.abilities attack.roll.trait) as | trait |}}
+                        {{localize trait.label}}
+                    {{/with}}
+                </span>
             </div>
         {{/if}}
-
         {{#if (lookup config.GENERAL.range attack.range)}}
-            <div class="tooltip-information">
-                <label>{{localize "DAGGERHEART.GENERAL.range"}}</label>
-                {{#with (lookup config.GENERAL.range attack.range) as | range |}}
-                    <div>{{localize range.label}}</div>
-                {{/with}}
+            <div class="tag">
+                <span>
+                    {{localize "DAGGERHEART.GENERAL.range"}}
+                    {{#with (lookup config.GENERAL.range attack.range) as | range |}}
+                        {{localize range.label}}
+                    {{/with}}
+                </span>
             </div>
         {{/if}}
-
-        <div class="tooltip-information">
-            <label>{{localize "DAGGERHEART.GENERAL.damage"}}</label>
-            <div>{{{damageFormula attack}}}</div>
-        </div>
-        <div class="tooltip-information">
-            <label>{{localize "DAGGERHEART.GENERAL.damageType"}}</label>
-            <div>{{{damageSymbols attack.damage.parts}}}</div>
+        <div class="tag">
+            <span>{{{damageFormula attack}}} {{{damageSymbols attack.damage.parts}}}</span>
         </div>
     </div>
+    {{#if description}}
+        <div class="tooltip-description">{{{description}}}</div>
+    {{/if}}
+
+    <p class="tooltip-hint">
+        <i class="fa-solid fa-computer-mouse"></i> {{localize "DAGGERHEART.UI.Tooltip.middleClick"}}
+    </p>
 </div>
\ No newline at end of file
diff --git a/templates/ui/tooltip/beastform.hbs b/templates/ui/tooltip/beastform.hbs
index 0b90c8f7..1b04ac82 100644
--- a/templates/ui/tooltip/beastform.hbs
+++ b/templates/ui/tooltip/beastform.hbs
@@ -1,31 +1,41 @@
-<div class="daggerheart dh-style tooltip">
-    <h2 class="tooltip-title">{{item.name}}</h2>
+<div class="daggerheart dh-style tooltip card-style">
     <img class="tooltip-image" src="{{item.img}}" />
-    <div class="tooltip-description">{{{description}}}</div>
+    <h2 class="tooltip-title">{{item.name}}</h2>
+    <p class="tooltip-subtitle"><i>{{item.system.examples}}</i></p>
 
-    <div class="simple-info">{{item.system.examples}}</div>
-    {{> "systems/daggerheart/templates/ui/tooltip/parts/tooltipChips.hbs" chips=item.system.advantageOn label=(localize "DAGGERHEART.ITEMS.Beastform.FIELDS.advantageOn.label")}}
+    {{#if description}}
+        <div class="tooltip-description">{{{description}}}</div>
+    {{/if}}
 
-    <div class="tooltip-information-section spaced">
-        {{#with item.system.beastformAttackData}}
-            <div class="tooltip-information">
-                <label>{{localize "DAGGERHEART.ITEMS.Beastform.mainTrait"}}</label>
-                <div>{{this.trait}}</div>
+    <div class="tags">
+        {{#with item.system.beastformAttackData}} 
+            <div class="tag">
+                <span>{{localize "DAGGERHEART.ITEMS.Beastform.mainTrait"}} {{this.trait}}</span>
             </div>
-            <div class="tooltip-information">
-                <label>{{localize "DAGGERHEART.ITEMS.Beastform.traitBonus"}}</label>
-                <div>{{this.traitBonus}}</div>
+            <div class="tag">
+                <span>{{localize "DAGGERHEART.ITEMS.Beastform.traitBonus"}} {{this.traitBonus}}</span>
             </div>
-            <div class="tooltip-information">
-                <label>{{localize "DAGGERHEART.GENERAL.evasion"}}</label>
-                <div>{{this.evasionBonus}}</div>
+            <div class="tag">
+                <span>{{localize "DAGGERHEART.GENERAL.evasion"}} {{this.evasionBonus}}</span>
             </div>
-            <div class="tooltip-information">
-                <label>{{localize "DAGGERHEART.GENERAL.damage"}}</label>
-                <div>{{concat this.damageDice ' ' this.damageBonus}} <i class="fa-solid fa-hand-fist"></i></div>
+            <div class="tag">
+                <span>{{localize "DAGGERHEART.GENERAL.damage"}} {{concat this.damageDice ' ' this.damageBonus}} <i class="fa-solid fa-hand-fist"></i></span>
             </div>
         {{/with}}
     </div>
 
+    <h2 class="tooltip-title">{{localize "DAGGERHEART.ITEMS.Beastform.FIELDS.advantageOn.label"}}</h2>
+    <div class="tags advantages">
+        {{#each item.system.advantageOn as | chip |}}
+            <div class="tag">
+                <span>{{ifThen chip.value chip.value chip}}</span>
+            </div>
+        {{/each}}
+    </div>
+
     {{> "systems/daggerheart/templates/ui/tooltip/parts/tooltipTags.hbs" features=item.system.features label=(localize "DAGGERHEART.GENERAL.features")}}
+
+    <p class="tooltip-hint">
+        <i class="fa-solid fa-computer-mouse"></i> {{localize "DAGGERHEART.UI.Tooltip.middleClick"}}
+    </p>
 </div>
\ No newline at end of file
diff --git a/templates/ui/tooltip/consumable.hbs b/templates/ui/tooltip/consumable.hbs
index d39cdfa6..db87547c 100644
--- a/templates/ui/tooltip/consumable.hbs
+++ b/templates/ui/tooltip/consumable.hbs
@@ -1,12 +1,16 @@
-<div class="daggerheart dh-style tooltip">
-    <h2 class="tooltip-title">{{item.name}}</h2>
+<div class="daggerheart dh-style tooltip card-style">
     <img class="tooltip-image" src="{{item.img}}" />
-    <div class="tooltip-description">{{{description}}}</div>
-
-    <div class="tooltip-information-section">
-        <div class="tooltip-information full-width">
-            <label>{{localize "DAGGERHEART.GENERAL.quantity"}}</label>
-            <div>{{item.system.quantity}}</div>
+    <h2 class="tooltip-title">{{item.name}}</h2>
+    <div class="tags">
+        <div class="tag">
+          <span>{{localize "DAGGERHEART.GENERAL.quantity"}} {{item.system.quantity}}</span>
         </div>
     </div>
+    {{#if description}}
+        <div class="tooltip-description">{{{description}}}</div>
+    {{/if}}
+
+    <p class="tooltip-hint">
+        <i class="fa-solid fa-computer-mouse"></i> {{localize "DAGGERHEART.UI.Tooltip.middleClick"}}
+    </p>
 </div>
\ No newline at end of file
diff --git a/templates/ui/tooltip/domainCard.hbs b/templates/ui/tooltip/domainCard.hbs
index 80d2b208..9388f1a4 100644
--- a/templates/ui/tooltip/domainCard.hbs
+++ b/templates/ui/tooltip/domainCard.hbs
@@ -1,29 +1,32 @@
-<div class="daggerheart dh-style tooltip">
-    <h2 class="tooltip-title">{{item.name}}</h2>
+<div class="daggerheart dh-style tooltip domain-card card-style">
+    <div class="item-icons-list">
+        <span class="item-icon">
+            <span class="recall-value">{{item.system.recallCost}}</span>
+            <i class="fa-solid fa-bolt"></i>
+        </span>
+        <span class="item-icon">
+            {{#with (lookup config.DOMAIN.domains item.system.domain) as | domain |}}
+                <img src="{{domain.src}}" alt="">
+            {{/with}}
+        </span>
+    </div>
     <img class="tooltip-image" src="{{item.img}}" />
-    <div class="tooltip-description">{{{description}}}</div>
-
-    <div class="tooltip-information-section">
-        <div class="tooltip-information">
-            <label>{{localize "DAGGERHEART.GENERAL.Domain.single"}}</label>
-            {{#with (lookup allDomains item.system.domain) as | domain |}}
-                <div>{{localize domain.label}}</div>
-            {{/with}}
-        </div>
-        
-        <div class="tooltip-information">
-            <label>{{localize "Type"}}</label>
+    <h2 class="tooltip-title">{{item.name}}</h2>
+    <div class="tags">
+        <div class="tag">
             {{#with (lookup config.DOMAIN.cardTypes item.system.type) as | type |}}
-                <div>{{localize type.label}}</div>
+                <span>{{localize type.label}}</span>
             {{/with}}
         </div>
-        <div class="tooltip-information">
-            <label>{{localize "DAGGERHEART.GENERAL.level"}}</label>
-            <div>{{item.system.level}}</div>
-        </div>
-        <div class="tooltip-information">
-            <label>{{localize "DAGGERHEART.ITEMS.DomainCard.recallCost"}}</label>
-            <div>{{item.system.recallCost}}</div>
+        <div class="tag">
+            <span>{{localize 'DAGGERHEART.GENERAL.levelShort'}} {{ item.system.level }}</span>
         </div>
     </div>
+    {{#if description}}      
+      <div class="tooltip-description">{{{description}}}</div>
+    {{/if}}
+
+    <p class="tooltip-hint">
+        <i class="fa-solid fa-computer-mouse"></i> {{localize "DAGGERHEART.UI.Tooltip.middleClick"}}
+    </p>
 </div>
\ No newline at end of file
diff --git a/templates/ui/tooltip/effect.hbs b/templates/ui/tooltip/effect.hbs
index fb07d895..4430b91d 100644
--- a/templates/ui/tooltip/effect.hbs
+++ b/templates/ui/tooltip/effect.hbs
@@ -1,5 +1,7 @@
-<div class="daggerheart dh-style tooltip">
-    <h2 class="tooltip-title">{{item.name}}</h2>
+<div class="daggerheart dh-style tooltip card-style">
     <img class="tooltip-image" src="{{item.img}}" />
-    <div class="tooltip-description">{{{description}}}</div>
+    <h2 class="tooltip-title">{{item.name}}</h2>
+    {{#if description}}
+        <div class="tooltip-description">{{{description}}}</div>
+    {{/if}}
 </div>
\ No newline at end of file
diff --git a/templates/ui/tooltip/feature.hbs b/templates/ui/tooltip/feature.hbs
index fb07d895..3dedb9b0 100644
--- a/templates/ui/tooltip/feature.hbs
+++ b/templates/ui/tooltip/feature.hbs
@@ -1,5 +1,12 @@
-<div class="daggerheart dh-style tooltip">
-    <h2 class="tooltip-title">{{item.name}}</h2>
+<div class="daggerheart dh-style tooltip card-style">
     <img class="tooltip-image" src="{{item.img}}" />
-    <div class="tooltip-description">{{{description}}}</div>
+    <h2 class="tooltip-title">{{item.name}}</h2>
+    <div class="tags">
+      <div class="tag">
+        <span>{{localize 'TYPES.Item.feature'}}</span>
+      </div>
+    </div>
+    {{#if description}}
+        <div class="tooltip-description">{{{description}}}</div>
+    {{/if}}
 </div>
\ No newline at end of file
diff --git a/templates/ui/tooltip/loot.hbs b/templates/ui/tooltip/loot.hbs
index 38e7cfb0..7d793d7c 100644
--- a/templates/ui/tooltip/loot.hbs
+++ b/templates/ui/tooltip/loot.hbs
@@ -1,7 +1,9 @@
-<div class="daggerheart dh-style tooltip">
-    <h2 class="tooltip-title">{{item.name}}</h2>
+<div class="daggerheart dh-style tooltip card-style">
     <img class="tooltip-image" src="{{item.img}}" />
-    <div class="tooltip-description">{{{description}}}</div>
+    <h2 class="tooltip-title">{{item.name}}</h2>
+    {{#if description}}
+        <div class="tooltip-description">{{{description}}}</div>
+    {{/if}}
 
     {{> "systems/daggerheart/templates/ui/tooltip/parts/tooltipTags.hbs" features=item.system.actions isAction=true label=(localize "DAGGERHEART.GENERAL.Action.plural") }}
 </div>
\ No newline at end of file
diff --git a/templates/ui/tooltip/parts/tooltipTags.hbs b/templates/ui/tooltip/parts/tooltipTags.hbs
index b77c2215..6a6d126d 100644
--- a/templates/ui/tooltip/parts/tooltipTags.hbs
+++ b/templates/ui/tooltip/parts/tooltipTags.hbs
@@ -1,12 +1,12 @@
-{{#if (gt features.length 0)}}<h4 class="tooltip-sub-title">{{label}}</h4>{{/if}}
+{{#if (gt features.length 0)}}<h2 class="tooltip-title">{{label}}</h2>{{/if}}
 <div class="tooltip-tags">
     {{#each features as | feature |}}
         {{#with (ifThen ../isAction feature (ifThen feature.item feature.item feature))}}
             <div class="tooltip-tag">
                 <div class="tooltip-tag-label-container">
-                        <div class="tooltip-tag-label">{{localize this.name}}</div>
                         {{#if this.img}}<img class="tooltip-tag-image" src="{{this.img}}" />{{/if}}
-                    </div>
+                        <span class="tooltip-tag-label">{{localize this.name}}</span>
+                </div>
                 <div class="tooltip-tag-description">{{{localize (ifThen this.enrichedDescription this.enrichedDescription this.system.enrichedDescription)}}}</div>
             </div>
         {{/with}}
diff --git a/templates/ui/tooltip/weapon.hbs b/templates/ui/tooltip/weapon.hbs
index 3c2a1407..a672c883 100644
--- a/templates/ui/tooltip/weapon.hbs
+++ b/templates/ui/tooltip/weapon.hbs
@@ -1,40 +1,36 @@
-<div class="daggerheart dh-style tooltip">
-    <h2 class="tooltip-title">{{item.name}}</h2>
+<div class="daggerheart dh-style tooltip weapon card-style">
     <img class="tooltip-image" src="{{item.img}}" />
-    <div class="tooltip-description">{{{description}}}</div>
-
-    <div class="tooltip-information-section">
-        <div class="tooltip-information">
-            <label>{{localize "DAGGERHEART.ITEMS.Weapon.weaponType"}}</label>
-            <div>{{#if item.system.secondary}}{{localize "DAGGERHEART.ITEMS.Weapon.secondaryWeapon"}}{{else}}{{localize "DAGGERHEART.ITEMS.Weapon.primaryWeapon"}}{{/if}}</div>
+    <h2 class="tooltip-title">{{item.name}}</h2>
+    <div class="tags">
+        <div class="tag">
+            <span>{{#if item.system.secondary}}{{localize "DAGGERHEART.ITEMS.Weapon.secondaryWeapon"}}{{else}}{{localize "DAGGERHEART.ITEMS.Weapon.primaryWeapon"}}{{/if}}</span>
         </div>
-        <div class="tooltip-information">
-            <label>{{localize "DAGGERHEART.GENERAL.burden"}}</label>
+        <div class="tag">
             {{#with (lookup config.GENERAL.burden item.system.burden) as | burden |}}
-                <div>{{localize burden.label}}</div>
+                <span>{{localize burden.label}}</span>
             {{/with}}
         </div>
         {{#if item.system.attack.roll.trait}}
-            <div class="tooltip-information">
-                <label>{{localize "DAGGERHEART.GENERAL.Trait.single"}}</label>
+            <div class="tag">
                 {{#with (lookup config.ACTOR.abilities item.system.attack.roll.trait) as | trait |}}
-                    <div>{{localize trait.label}}</div>
+                    <span>{{localize trait.label}}</span>
                 {{/with}}
             </div>
         {{/if}}
-        <div class="tooltip-information">
-            <label>{{localize "DAGGERHEART.GENERAL.range"}}</label>
+        <div class="tag">
             {{#with (lookup config.GENERAL.range item.system.attack.range) as | range |}}
-                <div>{{localize range.label}}</div>
+                <span>{{localize range.label}}</span>
             {{/with}}
         </div>
-        <div class="tooltip-information">
-            <label>{{localize "DAGGERHEART.GENERAL.damage"}}</label>
-            <div>{{{damageFormula item.system.attack}}}</div>
-        </div>
-        <div class="tooltip-information">
-            <label>{{localize "DAGGERHEART.GENERAL.damageType"}}</label>
-            <div>{{{damageSymbols item.system.attack.damage.parts}}}</div>
+        <div class="tag">
+          <span>{{{damageFormula item.system.attack}}} {{{damageSymbols item.system.attack.damage.parts}}}</span>
         </div>
     </div>
+    {{#if description}}
+        <div class="tooltip-description">{{{description}}}</div>
+    {{/if}}
+
+    <p class="tooltip-hint">
+        <i class="fa-solid fa-computer-mouse"></i> {{localize "DAGGERHEART.UI.Tooltip.middleClick"}}
+    </p>
 </div>
\ No newline at end of file