diff --git a/daggerheart.mjs b/daggerheart.mjs
index 83ae988b..9cb2e8d9 100644
--- a/daggerheart.mjs
+++ b/daggerheart.mjs
@@ -263,7 +263,7 @@ Hooks.on('setup', () => {
     );
     const actorCommon = {
         bar: ['resources.stress'],
-        value: [...resistance, 'advantageSources', 'disadvantageSources']
+        value: [...resistance]
     };
     CONFIG.Actor.trackableAttributes = {
         character: {
@@ -281,7 +281,7 @@ Hooks.on('setup', () => {
         },
         adversary: {
             bar: [...actorCommon.bar, 'resources.hitPoints'],
-            value: [...actorCommon.value, ...damageThresholds, 'criticalThreshold', 'difficulty']
+            value: [...actorCommon.value, ...damageThresholds, 'criticalThreshold']
         },
         companion: {
             bar: [...actorCommon.bar],
diff --git a/lang/en.json b/lang/en.json
index 1f73ca4f..59b058ab 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -685,15 +685,6 @@
             }
         },
         "CONFIG": {
-            "ActiveEffectDuration": {
-                "temporary": "Temporary",
-                "act": "Next Spotlight",
-                "scene": "Next Scene",
-                "shortRest": "Next Rest",
-                "longRest": "Next Long Rest",
-                "session": "Next Session",
-                "custom": "Custom"
-            },
             "AdversaryTrait": {
                 "relentless": {
                     "name": "Relentless",
@@ -2548,10 +2539,6 @@
                     "hint": "Automatically increase the GM's fear pool on a fear duality roll result."
                 },
                 "FIELDS": {
-                    "autoExpireActiveEffects": {
-                        "label": "Auto Expire Active Effects",
-                        "hint": "Active Effects with set durations will automatically be removed when their durations are up"
-                    },
                     "damageReductionRulesDefault": {
                         "label": "Damage Reduction Rules Default",
                         "hint": "Wether using armor and reductions has rules on by default"
diff --git a/module/applications/dialogs/downtime.mjs b/module/applications/dialogs/downtime.mjs
index 52cced3e..4c01c2a9 100644
--- a/module/applications/dialogs/downtime.mjs
+++ b/module/applications/dialogs/downtime.mjs
@@ -1,4 +1,4 @@
-import { expireActiveEffects, refreshIsAllowed } from '../../helpers/utils.mjs';
+import { refreshIsAllowed } from '../../helpers/utils.mjs';
 
 const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api;
 
@@ -264,8 +264,6 @@ export default class DhpDowntime extends HandlebarsApplicationMixin(ApplicationV
                 await feature.update({ 'system.resource.value': resetValue });
             }
 
-            expireActiveEffects(this.actor, [this.shortRest ? 'shortRest' : 'longRest']);
-
             this.close();
         } else {
             this.render();
diff --git a/module/applications/sheets-configs/activeEffectConfig.mjs b/module/applications/sheets-configs/activeEffectConfig.mjs
index 75173f8d..27a94736 100644
--- a/module/applications/sheets-configs/activeEffectConfig.mjs
+++ b/module/applications/sheets-configs/activeEffectConfig.mjs
@@ -166,17 +166,6 @@ export default class DhActiveEffectConfig extends foundry.applications.sheets.Ac
                     }));
                 }
                 break;
-            case 'settings':
-                const groups = {
-                    time: _loc('EFFECT.DURATION.UNITS.GROUPS.time'),
-                    combat: _loc('EFFECT.DURATION.UNITS.GROUPS.combat')
-                };
-                partContext.durationUnits = CONST.ACTIVE_EFFECT_DURATION_UNITS.map(value => ({
-                    value,
-                    label: _loc(`EFFECT.DURATION.UNITS.${value}`),
-                    group: CONST.ACTIVE_EFFECT_TIME_DURATION_UNITS.includes(value) ? groups.time : groups.combat
-                }));
-                break;
             case 'changes':
                 const fields = this.document.system.schema.fields.changes.element.fields;
                 partContext.changes = await Promise.all(
@@ -217,26 +206,4 @@ export default class DhActiveEffectConfig extends foundry.applications.sheets.Ac
             )
         );
     }
-
-    /** @inheritDoc */
-    _onChangeForm(_formConfig, event) {
-        if (foundry.utils.isElementInstanceOf(event.target, 'select') && event.target.name === 'system.duration.type') {
-            const durationSection = this.element.querySelector('.custom-duration-section');
-            if (event.target.value === 'custom') durationSection.classList.add('visible');
-            else durationSection.classList.remove('visible');
-
-            const durationDescription = this.element.querySelector('.duration-description');
-            if (event.target.value === 'temporary') durationDescription.classList.add('visible');
-            else durationDescription.classList.remove('visible');
-        }
-    }
-
-    /** @inheritDoc */
-    _processFormData(event, form, formData) {
-        const submitData = super._processFormData(event, form, formData);
-        if (submitData.start && !submitData.start.time) submitData.start.time = '0';
-        else if (!submitData) submitData.start = null;
-
-        return submitData;
-    }
 }
diff --git a/module/applications/sidebar/tabs/daggerheartMenu.mjs b/module/applications/sidebar/tabs/daggerheartMenu.mjs
index a16a1490..b29437bf 100644
--- a/module/applications/sidebar/tabs/daggerheartMenu.mjs
+++ b/module/applications/sidebar/tabs/daggerheartMenu.mjs
@@ -1,4 +1,4 @@
-import { expireActiveEffects, refreshIsAllowed } from '../../../helpers/utils.mjs';
+import { refreshIsAllowed } from '../../../helpers/utils.mjs';
 
 const { HandlebarsApplicationMixin } = foundry.applications.api;
 const { AbstractSidebarTab } = foundry.applications.sidebar;
@@ -58,8 +58,6 @@ export default class DaggerheartMenu extends HandlebarsApplicationMixin(Abstract
         const refreshedActors = {};
         for (let actor of game.actors) {
             if (['character', 'adversary'].includes(actor.type) && actor.prototypeToken.actorLink) {
-                expireActiveEffects(actor, types);
-
                 const updates = {};
                 for (let item of actor.items) {
                     if (item.system.metadata?.hasResource && refreshIsAllowed(types, item.system.resource?.recovery)) {
diff --git a/module/applications/ui/combatTracker.mjs b/module/applications/ui/combatTracker.mjs
index 345c6fcd..fc47f085 100644
--- a/module/applications/ui/combatTracker.mjs
+++ b/module/applications/ui/combatTracker.mjs
@@ -1,5 +1,4 @@
 import { AdversaryBPPerEncounter } from '../../config/encounterConfig.mjs';
-import { expireActiveEffects } from '../../helpers/utils.mjs';
 
 export default class DhCombatTracker extends foundry.applications.sidebar.tabs.CombatTracker {
     static DEFAULT_OPTIONS = {
@@ -178,8 +177,6 @@ export default class DhCombatTracker extends foundry.applications.sidebar.tabs.C
             if (autoPoints) {
                 update.system.actionTokens = Math.max(combatant.system.actionTokens - 1, 0);
             }
-
-            if (combatant.actor) expireActiveEffects(combatant.actor, [CONFIG.DH.GENERAL.activeEffectDurations.act.id]);
         }
 
         await this.viewed.update({
diff --git a/module/config/generalConfig.mjs b/module/config/generalConfig.mjs
index f993f1f8..b2833580 100644
--- a/module/config/generalConfig.mjs
+++ b/module/config/generalConfig.mjs
@@ -896,34 +896,3 @@ export const activeEffectArmorInteraction = {
     active: { id: 'active', label: 'DAGGERHEART.CONFIG.ArmorInteraction.active.label' },
     inactive: { id: 'inactive', label: 'DAGGERHEART.CONFIG.ArmorInteraction.inactive.label' }
 };
-
-export const activeEffectDurations = {
-    temporary: {
-        id: 'temporary',
-        label: 'DAGGERHEART.CONFIG.ActiveEffectDuration.temporary'
-    },
-    act: {
-        id: 'act',
-        label: 'DAGGERHEART.CONFIG.ActiveEffectDuration.act'
-    },
-    scene: {
-        id: 'scene',
-        label: 'DAGGERHEART.CONFIG.ActiveEffectDuration.scene'
-    },
-    shortRest: {
-        id: 'shortRest',
-        label: 'DAGGERHEART.CONFIG.ActiveEffectDuration.shortRest'
-    },
-    longRest: {
-        id: 'longRest',
-        label: 'DAGGERHEART.CONFIG.ActiveEffectDuration.longRest'
-    },
-    session: {
-        id: 'session',
-        label: 'DAGGERHEART.CONFIG.ActiveEffectDuration.session'
-    },
-    custom: {
-        id: 'custom',
-        label: 'DAGGERHEART.CONFIG.ActiveEffectDuration.custom'
-    }
-};
diff --git a/module/data/activeEffect/baseEffect.mjs b/module/data/activeEffect/baseEffect.mjs
index 98a961d7..b8f2c65f 100644
--- a/module/data/activeEffect/baseEffect.mjs
+++ b/module/data/activeEffect/baseEffect.mjs
@@ -33,14 +33,6 @@ export default class BaseEffect extends foundry.data.ActiveEffectTypeDataModel {
                     priority: new fields.NumberField()
                 })
             ),
-            duration: new fields.SchemaField({
-                type: new fields.StringField({
-                    choices: CONFIG.DH.GENERAL.activeEffectDurations,
-                    blank: true,
-                    label: 'DAGGERHEART.GENERAL.type'
-                }),
-                description: new fields.HTMLField({ label: 'DAGGERHEART.GENERAL.description' })
-            }),
             rangeDependence: new fields.SchemaField({
                 enabled: new fields.BooleanField({
                     required: true,
diff --git a/module/data/actor/adversary.mjs b/module/data/actor/adversary.mjs
index 78964720..d3844bcb 100644
--- a/module/data/actor/adversary.mjs
+++ b/module/data/actor/adversary.mjs
@@ -1,12 +1,11 @@
 import DHAdversarySettings from '../../applications/sheets-configs/adversary-settings.mjs';
 import { ActionField } from '../fields/actionField.mjs';
-import { commonActorRules } from './base.mjs';
-import DhCreature from './creature.mjs';
+import BaseDataActor, { commonActorRules } from './base.mjs';
 import { resourceField, bonusField } from '../fields/actorField.mjs';
 import { calculateExpectedValue, parseTermsFromSimpleFormula } from '../../helpers/utils.mjs';
 import { adversaryExpectedDamage, adversaryScalingData } from '../../config/actorConfig.mjs';
 
-export default class DhpAdversary extends DhCreature {
+export default class DhpAdversary extends BaseDataActor {
     static LOCALIZATION_PREFIXES = ['DAGGERHEART.ACTORS.Adversary'];
 
     static get metadata() {
diff --git a/module/data/actor/character.mjs b/module/data/actor/character.mjs
index cd8c4138..1ede6554 100644
--- a/module/data/actor/character.mjs
+++ b/module/data/actor/character.mjs
@@ -1,13 +1,12 @@
 import { burden } from '../../config/generalConfig.mjs';
 import ForeignDocumentUUIDField from '../fields/foreignDocumentUUIDField.mjs';
 import DhLevelData from '../levelData.mjs';
-import { commonActorRules } from './base.mjs';
-import DhCreature from './creature.mjs';
+import BaseDataActor, { commonActorRules } from './base.mjs';
 import { attributeField, resourceField, stressDamageReductionRule, bonusField } from '../fields/actorField.mjs';
 import { ActionField } from '../fields/actionField.mjs';
 import DHCharacterSettings from '../../applications/sheets-configs/character-settings.mjs';
 
-export default class DhCharacter extends DhCreature {
+export default class DhCharacter extends BaseDataActor {
     /**@override */
     static LOCALIZATION_PREFIXES = ['DAGGERHEART.ACTORS.Character'];
 
@@ -145,6 +144,14 @@ export default class DhCharacter extends DhCreature {
                     }
                 }
             }),
+            advantageSources: new fields.ArrayField(new fields.StringField(), {
+                label: 'DAGGERHEART.ACTORS.Character.advantageSources.label',
+                hint: 'DAGGERHEART.ACTORS.Character.advantageSources.hint'
+            }),
+            disadvantageSources: new fields.ArrayField(new fields.StringField(), {
+                label: 'DAGGERHEART.ACTORS.Character.disadvantageSources.label',
+                hint: 'DAGGERHEART.ACTORS.Character.disadvantageSources.hint'
+            }),
             levelData: new fields.EmbeddedDataField(DhLevelData),
             bonuses: new fields.SchemaField({
                 roll: new fields.SchemaField({
diff --git a/module/data/actor/companion.mjs b/module/data/actor/companion.mjs
index 6f51b593..40cece72 100644
--- a/module/data/actor/companion.mjs
+++ b/module/data/actor/companion.mjs
@@ -1,4 +1,4 @@
-import DhCreature from './creature.mjs';
+import BaseDataActor from './base.mjs';
 import DhLevelData from '../levelData.mjs';
 import ForeignDocumentUUIDField from '../fields/foreignDocumentUUIDField.mjs';
 import { ActionField } from '../fields/actionField.mjs';
@@ -6,7 +6,7 @@ import { adjustDice, adjustRange } from '../../helpers/utils.mjs';
 import DHCompanionSettings from '../../applications/sheets-configs/companion-settings.mjs';
 import { resourceField, bonusField } from '../fields/actorField.mjs';
 
-export default class DhCompanion extends DhCreature {
+export default class DhCompanion extends BaseDataActor {
     static LOCALIZATION_PREFIXES = ['DAGGERHEART.ACTORS.Companion'];
 
     /**@inheritdoc */
diff --git a/module/data/actor/creature.mjs b/module/data/actor/creature.mjs
deleted file mode 100644
index 4b927aed..00000000
--- a/module/data/actor/creature.mjs
+++ /dev/null
@@ -1,20 +0,0 @@
-import BaseDataActor from './base.mjs';
-
-export default class DhCreature extends BaseDataActor {
-    /**@inheritdoc */
-    static defineSchema() {
-        const fields = foundry.data.fields;
-
-        return {
-            ...super.defineSchema(),
-            advantageSources: new fields.ArrayField(new fields.StringField(), {
-                label: 'DAGGERHEART.ACTORS.Character.advantageSources.label',
-                hint: 'DAGGERHEART.ACTORS.Character.advantageSources.hint'
-            }),
-            disadvantageSources: new fields.ArrayField(new fields.StringField(), {
-                label: 'DAGGERHEART.ACTORS.Character.disadvantageSources.label',
-                hint: 'DAGGERHEART.ACTORS.Character.disadvantageSources.hint'
-            })
-        };
-    }
-}
diff --git a/module/data/settings/Automation.mjs b/module/data/settings/Automation.mjs
index edc4eb28..e9952b1c 100644
--- a/module/data/settings/Automation.mjs
+++ b/module/data/settings/Automation.mjs
@@ -192,11 +192,6 @@ export default class DhAutomation extends foundry.abstract.DataModel {
                     })
                 })
             }),
-            autoExpireActiveEffects: new fields.BooleanField({
-                required: true,
-                initial: true,
-                label: 'DAGGERHEART.SETTINGS.Automation.FIELDS.autoExpireActiveEffects.label'
-            }),
             triggers: new fields.SchemaField({
                 enabled: new fields.BooleanField({
                     nullable: false,
diff --git a/module/dice/dualityRoll.mjs b/module/dice/dualityRoll.mjs
index 83b5559f..a19c7441 100644
--- a/module/dice/dualityRoll.mjs
+++ b/module/dice/dualityRoll.mjs
@@ -409,9 +409,7 @@ export default class DualityRoll extends D20Roll {
                 difficulty: message.system.roll.difficulty ? Number(message.system.roll.difficulty) : null
             }
         });
-
-        const extraIndex = newRoll.advantage ? 3 : 2;
-        newRoll.extra = newRoll.extra.slice(extraIndex);
+        newRoll.extra = newRoll.extra.slice(2);
 
         const tagTeamSettings = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.TagTeamRoll);
 
diff --git a/module/documents/activeEffect.mjs b/module/documents/activeEffect.mjs
index 0fa84255..56981c52 100644
--- a/module/documents/activeEffect.mjs
+++ b/module/documents/activeEffect.mjs
@@ -52,20 +52,6 @@ export default class DhActiveEffect extends foundry.documents.ActiveEffect {
         });
     }
 
-    /**
-     * Whether this Active Effect is eligible to be registered with the {@link ActiveEffectRegistry}
-     */
-    get isExpiryTrackable() {
-        return (
-            this.persisted &&
-            !this.inCompendium &&
-            this.modifiesActor &&
-            this.start &&
-            this.isTemporary &&
-            !this.isExpired
-        );
-    }
-
     /* -------------------------------------------- */
     /*  Event Handlers                              */
     /* -------------------------------------------- */
diff --git a/module/helpers/utils.mjs b/module/helpers/utils.mjs
index 54eec645..9dc12d9e 100644
--- a/module/helpers/utils.mjs
+++ b/module/helpers/utils.mjs
@@ -477,8 +477,6 @@ export async function waitForDiceSoNice(message) {
 }
 
 export function refreshIsAllowed(allowedTypes, typeToCheck) {
-    if (!allowedTypes) return true;
-
     switch (typeToCheck) {
         case CONFIG.DH.GENERAL.refreshTypes.scene.id:
         case CONFIG.DH.GENERAL.refreshTypes.session.id:
@@ -495,34 +493,6 @@ export function refreshIsAllowed(allowedTypes, typeToCheck) {
     }
 }
 
-function expireActiveEffectIsAllowed(allowedTypes, typeToCheck) {
-    if (typeToCheck === CONFIG.DH.GENERAL.activeEffectDurations.act.id) return true;
-
-    return refreshIsAllowed(allowedTypes, typeToCheck);
-}
-
-export function expireActiveEffects(actor, allowedTypes = null) {
-    const shouldExpireEffects = game.settings.get(
-        CONFIG.DH.id,
-        CONFIG.DH.SETTINGS.gameSettings.Automation
-    ).autoExpireActiveEffects;
-    if (!shouldExpireEffects) return;
-
-    const effectsToExpire = actor
-        .getActiveEffects()
-        .filter(effect => {
-            if (!effect.system?.duration.type) return false;
-
-            const { temporary, custom } = CONFIG.DH.GENERAL.activeEffectDurations;
-            if ([temporary.id, custom.id].includes(effect.system.duration.type)) return false;
-
-            return expireActiveEffectIsAllowed(allowedTypes, effect.system.duration.type);
-        })
-        .map(x => x.id);
-
-    actor.deleteEmbeddedDocuments('ActiveEffect', effectsToExpire);
-}
-
 export async function getCritDamageBonus(formula) {
     const critRoll = new Roll(formula);
     return critRoll.dice.reduce((acc, dice) => acc + dice.faces * dice.number, 0);
@@ -537,8 +507,6 @@ export function htmlToText(html) {
 
 export function getIconVisibleActiveEffects(effects) {
     return effects.filter(effect => {
-        if (!(effect instanceof game.system.api.documents.DhActiveEffect)) return true;
-
         const alwaysShown = effect.showIcon === CONST.ACTIVE_EFFECT_SHOW_ICON.ALWAYS;
         const conditionalShown = effect.showIcon === CONST.ACTIVE_EFFECT_SHOW_ICON.CONDITIONAL && !effect.transfer; // TODO: system specific logic
 
diff --git a/src/packs/adversaries/adversary_Acid_Burrower_89yAh30vaNQOALlz.json b/src/packs/adversaries/adversary_Acid_Burrower_89yAh30vaNQOALlz.json
index 70d0072b..e2b3a444 100644
--- a/src/packs/adversaries/adversary_Acid_Burrower_89yAh30vaNQOALlz.json
+++ b/src/packs/adversaries/adversary_Acid_Burrower_89yAh30vaNQOALlz.json
@@ -400,18 +400,18 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "act"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "",
           "tint": "#ffffff",
@@ -423,16 +423,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!89yAh30vaNQOALlz.ctXYwil2D1zfsekT.9PsnogEPsp1OOK64"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Arch_Necromancer_WPEOIGfclNJxWb87.json b/src/packs/adversaries/adversary_Arch_Necromancer_WPEOIGfclNJxWb87.json
index 3b1f3535..d4e506cb 100644
--- a/src/packs/adversaries/adversary_Arch_Necromancer_WPEOIGfclNJxWb87.json
+++ b/src/packs/adversaries/adversary_Arch_Necromancer_WPEOIGfclNJxWb87.json
@@ -488,19 +488,18 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary",
-              "description": "<p>Until you roll with Hope.</p>"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "<p><em>Vulnerable</em> until you roll with Hope.</p>",
           "tint": "#ffffff",
@@ -512,16 +511,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!WPEOIGfclNJxWb87.4EECsXzHFG0RoIg0.KGdf2eqcXkdigg0u"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Assassin_Poisoner_h5RuhzGL17dW5FBT.json b/src/packs/adversaries/adversary_Assassin_Poisoner_h5RuhzGL17dW5FBT.json
index 324fc25e..8b553c83 100644
--- a/src/packs/adversaries/adversary_Assassin_Poisoner_h5RuhzGL17dW5FBT.json
+++ b/src/packs/adversaries/adversary_Assassin_Poisoner_h5RuhzGL17dW5FBT.json
@@ -277,21 +277,20 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary",
-              "description": "<p>Until you clear a HP.</p>"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
-          "description": "<p><em>Vulnerable</em> until you clear a HP.</p>",
+          "description": "<p> <em>Vulnerable</em> until you clear a HP.</p>",
           "tint": "#ffffff",
           "statuses": [
             "vulnerable"
@@ -301,16 +300,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!h5RuhzGL17dW5FBT.Fz2lnUEeBxsDpx0G.2iBVUGHtGW3I9VIj"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Battle_Box_dgH3fW9FTYLaIDvS.json b/src/packs/adversaries/adversary_Battle_Box_dgH3fW9FTYLaIDvS.json
index 02553014..96a1b752 100644
--- a/src/packs/adversaries/adversary_Battle_Box_dgH3fW9FTYLaIDvS.json
+++ b/src/packs/adversaries/adversary_Battle_Box_dgH3fW9FTYLaIDvS.json
@@ -667,21 +667,20 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary",
-              "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;\">Until their next roll with Hope.</span></p>"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
-          "description": "<p><em>Vulnerable</em> until your next roll with Hope.</p>",
+          "description": "<p><em>Vulnerable</em> until your next roll with Hope. </p>",
           "tint": "#ffffff",
           "statuses": [
             "vulnerable"
@@ -691,16 +690,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!dgH3fW9FTYLaIDvS.XtnByqUr9AuYU9Ip.9NQcCXMhjyBReJRd"
         }
       ],
@@ -894,21 +883,20 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary",
-              "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;\">Until the cube is defeated.</span></p>"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
-          "description": "<p><em>Vulnerable</em> until the cube is defeated.</p>",
+          "description": "<p><em>Vulnerable</em> until the cube is defeated. </p>",
           "tint": "#ffffff",
           "statuses": [
             "vulnerable"
@@ -918,16 +906,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!dgH3fW9FTYLaIDvS.ijIaKjroxq3xZd9Z.S7kJlhnV8Nexzi8l"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Bear_71qKDLKO3CsrNkdy.json b/src/packs/adversaries/adversary_Bear_71qKDLKO3CsrNkdy.json
index 959ef9dd..da5de611 100644
--- a/src/packs/adversaries/adversary_Bear_71qKDLKO3CsrNkdy.json
+++ b/src/packs/adversaries/adversary_Bear_71qKDLKO3CsrNkdy.json
@@ -368,19 +368,18 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary",
-              "description": "<p>Until you break free with a successful Strength Roll.</p>"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "<p>You are <em>Restrained</em> until you break free with a successful Strength Roll.</p>",
           "tint": "#ffffff",
@@ -392,16 +391,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!71qKDLKO3CsrNkdy.zgR0MEqyobKp2yXr.U50Ccm9emMqAxma6"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Bladed_Guard_B4LZcGuBAHzyVdzy.json b/src/packs/adversaries/adversary_Bladed_Guard_B4LZcGuBAHzyVdzy.json
index 0a332575..8ee7c56c 100644
--- a/src/packs/adversaries/adversary_Bladed_Guard_B4LZcGuBAHzyVdzy.json
+++ b/src/packs/adversaries/adversary_Bladed_Guard_B4LZcGuBAHzyVdzy.json
@@ -376,19 +376,18 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary",
-              "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;\">Until you break free with a successful attack, Finesse Roll, or Strength Roll.</span></p>"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "<p>You are <em>Restrained</em> until you break free with a successful attack, Finesse Roll, or Strength Roll.</p>",
           "tint": "#ffffff",
@@ -400,16 +399,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!B4LZcGuBAHzyVdzy.9gizFt9ovKL05DXu.LmzztuktRkwOCy1a"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Brawny_Zombie_2UeZ0tEe7AzgSJNd.json b/src/packs/adversaries/adversary_Brawny_Zombie_2UeZ0tEe7AzgSJNd.json
index a169bf61..c829c3f9 100644
--- a/src/packs/adversaries/adversary_Brawny_Zombie_2UeZ0tEe7AzgSJNd.json
+++ b/src/packs/adversaries/adversary_Brawny_Zombie_2UeZ0tEe7AzgSJNd.json
@@ -452,18 +452,18 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "",
           "tint": "#ffffff",
@@ -475,16 +475,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!2UeZ0tEe7AzgSJNd.69reUZ5tv3splqyO.CjMrSdL6kgD8mKRQ"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Courtesan_ZxWaWPdzFIUPNC62.json b/src/packs/adversaries/adversary_Courtesan_ZxWaWPdzFIUPNC62.json
index 24572103..668cd943 100644
--- a/src/packs/adversaries/adversary_Courtesan_ZxWaWPdzFIUPNC62.json
+++ b/src/packs/adversaries/adversary_Courtesan_ZxWaWPdzFIUPNC62.json
@@ -320,19 +320,18 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary",
-              "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;\">Until the scene ends or they succeed on a social action against the </span><span style=\"box-sizing: border-box; scrollbar-width: thin; scrollbar-color: rgb(93, 20, 43) rgba(0, 0, 0, 0); font-family: Montserrat, sans-serif; color: rgb(239, 230, 216); 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;\">Courtesan</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;\">.</span></p>"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "<p><em>Vulnerable</em> until the scene ends or they succeed on a social action against the Courtesan.</p>",
           "tint": "#ffffff",
@@ -344,16 +343,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!ZxWaWPdzFIUPNC62.rSMUPC5GhR982ifg.blcRqns0PHqiuPac"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Courtier_CBBuEXAlLKFMJdjg.json b/src/packs/adversaries/adversary_Courtier_CBBuEXAlLKFMJdjg.json
index 1ffc7ece..6721666f 100644
--- a/src/packs/adversaries/adversary_Courtier_CBBuEXAlLKFMJdjg.json
+++ b/src/packs/adversaries/adversary_Courtier_CBBuEXAlLKFMJdjg.json
@@ -336,18 +336,18 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "scene"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "",
           "tint": "#ffffff",
@@ -359,16 +359,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!CBBuEXAlLKFMJdjg.LYNaKEYcYMgvF4Rf.YNMhgBZW8ndrCjIp"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Cult_Adept_0NxCSugvKQ4W8OYZ.json b/src/packs/adversaries/adversary_Cult_Adept_0NxCSugvKQ4W8OYZ.json
index e428d05d..14eb579b 100644
--- a/src/packs/adversaries/adversary_Cult_Adept_0NxCSugvKQ4W8OYZ.json
+++ b/src/packs/adversaries/adversary_Cult_Adept_0NxCSugvKQ4W8OYZ.json
@@ -422,32 +422,31 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [
-              {
-                "key": "system.resistance.magical.resistance",
-                "value": 1,
-                "priority": null,
-                "type": "override"
-              },
-              {
-                "key": "system.resistance.physical.resistance",
-                "value": 1,
-                "priority": null,
-                "type": "override"
-              }
-            ],
-            "duration": {
-              "type": "temporary",
-              "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;\">Until the </span><span style=\"box-sizing: border-box; scrollbar-width: thin; scrollbar-color: rgb(93, 20, 43) rgba(0, 0, 0, 0); font-family: Montserrat, sans-serif; color: rgb(239, 230, 216); 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;\">Cult Adept</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;\"> marks their last HP.</span></p>"
             }
           },
+          "changes": [
+            {
+              "key": "system.resistance.magical.resistance",
+              "mode": 5,
+              "value": "1",
+              "priority": null
+            },
+            {
+              "key": "system.resistance.physical.resistance",
+              "mode": 5,
+              "value": "1",
+              "priority": null
+            }
+          ],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "<p>Resistance to all damage until the Adept marks their last HP</p>",
           "tint": "#ffffff",
@@ -457,16 +456,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!0NxCSugvKQ4W8OYZ.IHWDn097sRgjlZXO.U9lWz1LgeAiK5L85"
         }
       ],
@@ -544,19 +533,18 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary",
-              "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;\">Until you break free with a successful Strength or Instinct Roll.</span></p>"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "<p>You are<em> Restrained</em> in smoky chains until you 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>",
           "tint": "#ffffff",
@@ -568,16 +556,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!0NxCSugvKQ4W8OYZ.JpSrduK3vjd9h098.lNH6srSPyEprXZ4o"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Cult_Fang_tyBOpLfigAhI9bU3.json b/src/packs/adversaries/adversary_Cult_Fang_tyBOpLfigAhI9bU3.json
index d3b341f0..57e7a7c7 100644
--- a/src/packs/adversaries/adversary_Cult_Fang_tyBOpLfigAhI9bU3.json
+++ b/src/packs/adversaries/adversary_Cult_Fang_tyBOpLfigAhI9bU3.json
@@ -384,18 +384,18 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "",
           "tint": "#ffffff",
@@ -407,16 +407,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!tyBOpLfigAhI9bU3.ohASSruBxcvuItIK.LwWxRz7FTMA80VdA"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Deeproot_Defender_9x2xY9zwc3xzbXo5.json b/src/packs/adversaries/adversary_Deeproot_Defender_9x2xY9zwc3xzbXo5.json
index f66ce7f0..cd745eb6 100644
--- a/src/packs/adversaries/adversary_Deeproot_Defender_9x2xY9zwc3xzbXo5.json
+++ b/src/packs/adversaries/adversary_Deeproot_Defender_9x2xY9zwc3xzbXo5.json
@@ -407,19 +407,18 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary",
-              "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;\">Until the </span><span style=\"box-sizing: border-box; scrollbar-width: thin; scrollbar-color: rgb(93, 20, 43) rgba(0, 0, 0, 0); font-family: Montserrat, sans-serif; color: rgb(239, 230, 216); 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;\">Deeproot Defender</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;\"> takes Severe damage.</span></p>"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "<p>You are <em>Restrained </em>until the Defender takes Severe damage.</p>",
           "tint": "#ffffff",
@@ -431,16 +430,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!9x2xY9zwc3xzbXo5.rreGFW5TbhUoZf2T.F3E7fiz01AbF2kr5"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Demon_of_Despair_kE4dfhqmIQpNd44e.json b/src/packs/adversaries/adversary_Demon_of_Despair_kE4dfhqmIQpNd44e.json
index 27c6bac2..830848c3 100644
--- a/src/packs/adversaries/adversary_Demon_of_Despair_kE4dfhqmIQpNd44e.json
+++ b/src/packs/adversaries/adversary_Demon_of_Despair_kE4dfhqmIQpNd44e.json
@@ -354,25 +354,25 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [
-              {
-                "key": "system.rules.dualityRoll.defaultHopeDice",
-                "value": "d8",
-                "priority": null,
-                "type": "override"
-              }
-            ],
-            "duration": {
-              "type": "shortRest"
             }
           },
+          "changes": [
+            {
+              "key": "system.rules.dualityRoll.defaultHopeDice",
+              "mode": 5,
+              "value": "d8",
+              "priority": null
+            }
+          ],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "<p>All targets affected replace their Hope Die with a <strong>d8</strong> until they roll a success with Hope or their next rest.</p>",
           "tint": "#ffffff",
@@ -382,16 +382,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!kE4dfhqmIQpNd44e.FC8PIf4BVkhmoJX8.6WSx03mFbpbPWnOI"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Demon_of_Wrath_5lphJAgzoqZI3VoG.json b/src/packs/adversaries/adversary_Demon_of_Wrath_5lphJAgzoqZI3VoG.json
index 33ded6b9..2341ee8a 100644
--- a/src/packs/adversaries/adversary_Demon_of_Wrath_5lphJAgzoqZI3VoG.json
+++ b/src/packs/adversaries/adversary_Demon_of_Wrath_5lphJAgzoqZI3VoG.json
@@ -317,25 +317,25 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [
-              {
-                "key": "system.rules.dualityRoll.defaultFearDice",
-                "value": "d20",
-                "priority": null,
-                "type": "override"
-              }
-            ],
-            "duration": {
-              "type": "scene"
             }
           },
+          "changes": [
+            {
+              "key": "system.rules.dualityRoll.defaultFearDice",
+              "mode": 5,
+              "value": "d20",
+              "priority": null
+            }
+          ],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "<p>You use a d20 as your Fear Die until the end of the scene.</p>",
           "tint": "#ffffff",
@@ -345,16 +345,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!5lphJAgzoqZI3VoG.a33PW8UkziliowlR.gFeHLGgeRoDdd3VG"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Dire_Wolf_wNzeuQLfLUMvgHlQ.json b/src/packs/adversaries/adversary_Dire_Wolf_wNzeuQLfLUMvgHlQ.json
index 69301cb2..e3ecda4e 100644
--- a/src/packs/adversaries/adversary_Dire_Wolf_wNzeuQLfLUMvgHlQ.json
+++ b/src/packs/adversaries/adversary_Dire_Wolf_wNzeuQLfLUMvgHlQ.json
@@ -435,19 +435,18 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary",
-              "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;\">Until they clear at least 1 HP.</span></p>"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "",
           "tint": "#ffffff",
@@ -459,16 +458,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!wNzeuQLfLUMvgHlQ.85XrqDvLP30YOO43.YNKHEFQ4ucGr4Rmc"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Fallen_Sorcerer_PELRry1vqjBzSAlr.json b/src/packs/adversaries/adversary_Fallen_Sorcerer_PELRry1vqjBzSAlr.json
index bfad5cf6..fc064958 100644
--- a/src/packs/adversaries/adversary_Fallen_Sorcerer_PELRry1vqjBzSAlr.json
+++ b/src/packs/adversaries/adversary_Fallen_Sorcerer_PELRry1vqjBzSAlr.json
@@ -385,41 +385,30 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary",
-              "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;\">Until youbreak free with a successful Instinct Roll.</span></p>"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "<p><em>Restrained</em> and <em>Vulnerable</em> until you break free, ending both conditions, with a successful Instinct Roll.</p>",
           "tint": "#ffffff",
           "statuses": [
-            "vulnerable",
-            "restrained"
+            "restrained",
+            "vulnerable"
           ],
           "sort": 0,
           "flags": {},
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!PELRry1vqjBzSAlr.ecp9o8t1dQFXGsse.Q99saHj6NOY2PSXf"
         }
       ],
@@ -583,19 +572,18 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary",
-              "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;\">A target can break free from their regret with a successful Presence or Strength Roll.</span></p>"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "<p><em>Vulnerable</em> until you break free from your regret with a successful Presence or Strength Roll. If you fail to break free, you lose a Hope.</p>",
           "tint": "#ffffff",
@@ -607,16 +595,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!PELRry1vqjBzSAlr.gwSgBhkcekCGvXxz.pWDg0MADoohKu40O"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Giant_Beastmaster_8VZIgU12cB3cvlyH.json b/src/packs/adversaries/adversary_Giant_Beastmaster_8VZIgU12cB3cvlyH.json
index e576e1e0..6d09a490 100644
--- a/src/packs/adversaries/adversary_Giant_Beastmaster_8VZIgU12cB3cvlyH.json
+++ b/src/packs/adversaries/adversary_Giant_Beastmaster_8VZIgU12cB3cvlyH.json
@@ -352,19 +352,18 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary",
-              "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;\">Until you break free with a successful Finesse or Strength Roll.</span></p>"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "<p>You are <em>Restrained</em> until you break free with a successful Finesse or Strength Roll.</p>",
           "tint": "#ffffff",
@@ -376,16 +375,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!8VZIgU12cB3cvlyH.6ZrDjgnWufJohkp1.vb1sZCOLwDNLsr3j"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Giant_Eagle_OMQ0v6PE8s1mSU0K.json b/src/packs/adversaries/adversary_Giant_Eagle_OMQ0v6PE8s1mSU0K.json
index ea578762..b0ba4170 100644
--- a/src/packs/adversaries/adversary_Giant_Eagle_OMQ0v6PE8s1mSU0K.json
+++ b/src/packs/adversaries/adversary_Giant_Eagle_OMQ0v6PE8s1mSU0K.json
@@ -430,18 +430,18 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "act"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "<p><em>Vulnerable</em> until the next time you act.</p>",
           "tint": "#ffffff",
@@ -453,16 +453,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!OMQ0v6PE8s1mSU0K.MabIQE1Kjn60j08J.m6qqQZxukDPVcGdQ"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Giant_Scorpion_fmfntuJ8mHRCAktP.json b/src/packs/adversaries/adversary_Giant_Scorpion_fmfntuJ8mHRCAktP.json
index fda3e656..99b5ed46 100644
--- a/src/packs/adversaries/adversary_Giant_Scorpion_fmfntuJ8mHRCAktP.json
+++ b/src/packs/adversaries/adversary_Giant_Scorpion_fmfntuJ8mHRCAktP.json
@@ -438,18 +438,18 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "shortRest"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "<p>You are <em>Poisoned</em> until your next rest or until you succeed on a Knowledge Roll (16). While Poisoned, you must roll a <strong>d6</strong> before you make an action roll. On a result of 4 or lower, you must mark a Stress.</p><p>[[/dr trait=knowledge difficulty=16]]</p>",
           "tint": "#ffffff",
@@ -459,16 +459,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!fmfntuJ8mHRCAktP.lANiDkxxth2sGacT.oILkLJlGNZl7KI1R"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Gorgon_8mJYMpbLTb8qIOrr.json b/src/packs/adversaries/adversary_Gorgon_8mJYMpbLTb8qIOrr.json
index 2753d958..deeafa37 100644
--- a/src/packs/adversaries/adversary_Gorgon_8mJYMpbLTb8qIOrr.json
+++ b/src/packs/adversaries/adversary_Gorgon_8mJYMpbLTb8qIOrr.json
@@ -335,25 +335,25 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [
-              {
-                "key": "system.rules.conditionImmunities.hidden",
-                "value": 1,
-                "priority": null,
-                "type": "override"
-              }
-            ],
-            "duration": {
-              "type": "scene"
             }
           },
+          "changes": [
+            {
+              "key": "system.rules.conditionImmunities.hidden",
+              "mode": 5,
+              "value": "1",
+              "priority": null
+            }
+          ],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "<p>You Glow until the end of the scene and can’t become <em>Hidden</em>. Attack rolls made against you have advantage.</p>",
           "tint": "#ffffff",
@@ -363,16 +363,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!8mJYMpbLTb8qIOrr.NepVGKOo1lHYjA1F.bYBrgiSwHwYfQyjn"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Greater_Earth_Elemental_dsfB3YhoL5SudvS2.json b/src/packs/adversaries/adversary_Greater_Earth_Elemental_dsfB3YhoL5SudvS2.json
index fe968ff3..a20d80e6 100644
--- a/src/packs/adversaries/adversary_Greater_Earth_Elemental_dsfB3YhoL5SudvS2.json
+++ b/src/packs/adversaries/adversary_Greater_Earth_Elemental_dsfB3YhoL5SudvS2.json
@@ -507,19 +507,18 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary",
-              "description": "<p>Until your next roll with Hope.</p>"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "<p><em>Vulnerable</em> until your next roll with Hope.</p>",
           "tint": "#ffffff",
@@ -531,16 +530,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!dsfB3YhoL5SudvS2.q45DiEFlXqcXZ5hv.38MUzfbH64EMLVse"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Greater_Water_Elemental_xIICT6tEdnA7dKDV.json b/src/packs/adversaries/adversary_Greater_Water_Elemental_xIICT6tEdnA7dKDV.json
index 5d17f025..be037b10 100644
--- a/src/packs/adversaries/adversary_Greater_Water_Elemental_xIICT6tEdnA7dKDV.json
+++ b/src/packs/adversaries/adversary_Greater_Water_Elemental_xIICT6tEdnA7dKDV.json
@@ -459,41 +459,30 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary",
-              "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;\">You can break free with a successful Strength or Instinct Roll.</span></p>"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "<p>You are<em> Restrained</em> and <em>Vulnerable</em> as you are drowning. You can break free, ending both conditions, with a successful Strength or Instinct Roll.</p>",
           "tint": "#ffffff",
           "statuses": [
-            "vulnerable",
-            "restrained"
+            "restrained",
+            "vulnerable"
           ],
           "sort": 0,
           "flags": {},
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!xIICT6tEdnA7dKDV.bcwFQeuU6ZfIGjau.X8NF2OB23mSpDvlx"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Green_Ooze_SHXedd9zZPVfUgUa.json b/src/packs/adversaries/adversary_Green_Ooze_SHXedd9zZPVfUgUa.json
index 5f3f52c2..b03b5495 100644
--- a/src/packs/adversaries/adversary_Green_Ooze_SHXedd9zZPVfUgUa.json
+++ b/src/packs/adversaries/adversary_Green_Ooze_SHXedd9zZPVfUgUa.json
@@ -465,19 +465,18 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary",
-              "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;\">If the </span><span style=\"box-sizing: border-box; scrollbar-width: thin; scrollbar-color: rgb(93, 20, 43) rgba(0, 0, 0, 0); font-family: Montserrat, sans-serif; color: rgb(239, 230, 216); 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;\">Green Ooze</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;\"> takes Severe damage, the target is freed.</span></p>"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "<p>You must mark an additional Stress when you make an action roll. If the Ooze takes Severe damage, you are freed.</p>",
           "tint": "#ffffff",
@@ -487,16 +486,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!SHXedd9zZPVfUgUa.Sm9Sk4mSvcq6PkmR.yk5kR5OVLCgDWfgY"
         }
       ],
diff --git a/src/packs/adversaries/adversary_High_Seraph_r1mbfSSwKWdcFdAU.json b/src/packs/adversaries/adversary_High_Seraph_r1mbfSSwKWdcFdAU.json
index 60fe1917..0a952540 100644
--- a/src/packs/adversaries/adversary_High_Seraph_r1mbfSSwKWdcFdAU.json
+++ b/src/packs/adversaries/adversary_High_Seraph_r1mbfSSwKWdcFdAU.json
@@ -391,21 +391,20 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary",
-              "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;\">Until the </span><span style=\"box-sizing: border-box; scrollbar-width: thin; scrollbar-color: rgb(93, 20, 43) rgba(0, 0, 0, 0); font-family: Montserrat, sans-serif; color: rgb(239, 230, 216); 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;\">High Seraph</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;\"> is defeated. </span>The High Seraph can only mark one target at a time.</p>"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
-          "description": "<p>While Guilty, you don’t gain Hope on a result with Hope.</p>",
+          "description": "<p>While Guilty, you don’t gain Hope on a result with Hope. </p>",
           "tint": "#ffffff",
           "statuses": [],
           "sort": 0,
@@ -413,16 +412,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!r1mbfSSwKWdcFdAU.FilEB21L5q9XxKE1.O8G0oOf9f3qzNOAT"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json b/src/packs/adversaries/adversary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json
index db00c5e6..3bb8ae96 100644
--- a/src/packs/adversaries/adversary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json
+++ b/src/packs/adversaries/adversary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json
@@ -436,19 +436,18 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary",
-              "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;\">When the </span><span style=\"box-sizing: border-box; scrollbar-width: thin; scrollbar-color: rgb(93, 20, 43) rgba(0, 0, 0, 0); font-family: Montserrat, sans-serif; color: rgb(239, 230, 216); 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;\">Huge Green Ooze</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;\"> takes Severe damage, all Enveloped targets are freed and the condition is cleared.</span></p>"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "<p>While Enveloped, you must mark an additional Stress every time you make an action roll. When the Ooze takes Severe damage, all Enveloped targets are freed and the condition is cleared.</p>",
           "tint": "#ffffff",
@@ -458,16 +457,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!6hbqmxDXFOzZJDk4.pfXYuH7rtsyVjSXh.EwZ8owroJxFpg81e"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Hydra_MI126iMOOobQ1Obn.json b/src/packs/adversaries/adversary_Hydra_MI126iMOOobQ1Obn.json
index a12aaad8..4c6fd61f 100644
--- a/src/packs/adversaries/adversary_Hydra_MI126iMOOobQ1Obn.json
+++ b/src/packs/adversaries/adversary_Hydra_MI126iMOOobQ1Obn.json
@@ -507,26 +507,25 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [
-              {
-                "key": "system.resistance.magical.immunity",
-                "value": 1,
-                "priority": null,
-                "type": "override"
-              }
-            ],
-            "duration": {
-              "type": "temporary",
-              "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;\">Until the next roll with Fear.</span></p>"
             }
           },
+          "changes": [
+            {
+              "key": "system.resistance.magical.immunity",
+              "mode": 5,
+              "value": "1",
+              "priority": null
+            }
+          ],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "<p>While Dazed, they can’t use their Regeneration action but are immune to magic damage.</p>",
           "tint": "#ffffff",
@@ -536,16 +535,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!MI126iMOOobQ1Obn.sJzjcRBgYRp5f53E.iBJ3YhEkVsGKEIVk"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Jagged_Knife_Hexer_MbBPIOxaxXYNApXz.json b/src/packs/adversaries/adversary_Jagged_Knife_Hexer_MbBPIOxaxXYNApXz.json
index e56f7af5..6ca9749c 100644
--- a/src/packs/adversaries/adversary_Jagged_Knife_Hexer_MbBPIOxaxXYNApXz.json
+++ b/src/packs/adversaries/adversary_Jagged_Knife_Hexer_MbBPIOxaxXYNApXz.json
@@ -278,18 +278,18 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "<p>Whenever you roll with Hope, the hexer can <strong>mark a stress</strong> to make the roll be with Fear instead.</p>",
           "tint": "#ffffff",
@@ -299,16 +299,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!MbBPIOxaxXYNApXz.Bl8L0RCGOgVUzuXo.ihy3kvEGSOEKdNfT"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Jagged_Knife_Kneebreaker_CBKixLH3yhivZZuL.json b/src/packs/adversaries/adversary_Jagged_Knife_Kneebreaker_CBKixLH3yhivZZuL.json
index d8115fd9..c38260e9 100644
--- a/src/packs/adversaries/adversary_Jagged_Knife_Kneebreaker_CBKixLH3yhivZZuL.json
+++ b/src/packs/adversaries/adversary_Jagged_Knife_Kneebreaker_CBKixLH3yhivZZuL.json
@@ -334,26 +334,25 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [
-              {
-                "key": "system.rules.attack.damage.hpDamageTakenMultiplier",
-                "value": 2,
-                "priority": null,
-                "type": "override"
-              }
-            ],
-            "duration": {
-              "type": "temporary",
-              "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 target can break free, clearing both conditions, with a successful Strength Roll or is freed automatically if the </span><span style=\"box-sizing: border-box; scrollbar-width: thin; scrollbar-color: rgb(93, 20, 43) rgba(0, 0, 0, 0); font-family: Montserrat, sans-serif; color: rgb(239, 230, 216); 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;\">Jagged Knife Kneebreaker</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;\"> takes Major or greater damage.</span></p>"
             }
           },
+          "changes": [
+            {
+              "key": "system.rules.attack.damage.hpDamageTakenMultiplier",
+              "mode": 5,
+              "value": "2",
+              "priority": null
+            }
+          ],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "",
           "tint": "#ffffff",
@@ -366,16 +365,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!CBKixLH3yhivZZuL.Sa4Nt0eoDjirBKGf.d7sB1Qa1kJMnglqu"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Kraken_4nqv3ZwJGjnmic8j.json b/src/packs/adversaries/adversary_Kraken_4nqv3ZwJGjnmic8j.json
index 6f6f6edc..3b84774e 100644
--- a/src/packs/adversaries/adversary_Kraken_4nqv3ZwJGjnmic8j.json
+++ b/src/packs/adversaries/adversary_Kraken_4nqv3ZwJGjnmic8j.json
@@ -385,41 +385,30 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary",
-              "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;\">Until you break free with a successful Strength Roll or the </span><span style=\"box-sizing: border-box; scrollbar-width: thin; scrollbar-color: rgb(93, 20, 43) rgba(0, 0, 0, 0); font-family: Montserrat, sans-serif; color: rgb(239, 230, 216); 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;\">Kraken</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;\"> takes Major or greater damage.</span></p>"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "<p>You are <em>Restrained</em> and <em>Vulnerable</em> until you 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, you must mark a Stress when you make an action roll.</p>",
           "tint": "#ffffff",
           "statuses": [
-            "vulnerable",
-            "restrained"
+            "restrained",
+            "vulnerable"
           ],
           "sort": 0,
           "flags": {},
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!4nqv3ZwJGjnmic8j.vz2BWhispgR7mSWF.Xes6ZIE01CCN67KF"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Masked_Thief_niBpVU7yeo5ccskE.json b/src/packs/adversaries/adversary_Masked_Thief_niBpVU7yeo5ccskE.json
index 3143fbe3..528df6a9 100644
--- a/src/packs/adversaries/adversary_Masked_Thief_niBpVU7yeo5ccskE.json
+++ b/src/packs/adversaries/adversary_Masked_Thief_niBpVU7yeo5ccskE.json
@@ -400,41 +400,30 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary",
-              "description": "<p>Until you break free with a successful Finesse or Strength Roll (13).</p>"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "<p>You are <em>Restrained</em> and <em>Vulnerable</em> until you break free, ending both conditions, with a successful Finesse or Strength Roll (13).</p><p>[[/dr trait=finesse difficulty=13]]<br />[[/dr trait=strength difficulty=13]]</p>",
           "tint": "#ffffff",
           "statuses": [
-            "vulnerable",
-            "restrained"
+            "restrained",
+            "vulnerable"
           ],
           "sort": 0,
           "flags": {},
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!niBpVU7yeo5ccskE.tP2DD751nOLxFVps.zMut1PRphlwE0xOa"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Minor_Chaos_Elemental_sRn4bqerfARvhgSV.json b/src/packs/adversaries/adversary_Minor_Chaos_Elemental_sRn4bqerfARvhgSV.json
index 57dc2980..b1732c71 100644
--- a/src/packs/adversaries/adversary_Minor_Chaos_Elemental_sRn4bqerfARvhgSV.json
+++ b/src/packs/adversaries/adversary_Minor_Chaos_Elemental_sRn4bqerfARvhgSV.json
@@ -380,18 +380,18 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "shortRest"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "<p><em>Vulnerable</em> until your next rest or you clear a HP.</p>",
           "tint": "#ffffff",
@@ -403,16 +403,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!sRn4bqerfARvhgSV.oAxhAawgcK7DAdpa.KIyV2eXDmmymXY5y"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Mortal_Hunter_mVV7a7KQAORoPMgZ.json b/src/packs/adversaries/adversary_Mortal_Hunter_mVV7a7KQAORoPMgZ.json
index 01218718..8bc7fe10 100644
--- a/src/packs/adversaries/adversary_Mortal_Hunter_mVV7a7KQAORoPMgZ.json
+++ b/src/packs/adversaries/adversary_Mortal_Hunter_mVV7a7KQAORoPMgZ.json
@@ -444,18 +444,18 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "scene"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "<p>Attacks made by the Hunter against a Deathlocked target deal direct damage.</p>",
           "tint": "#ffffff",
@@ -465,16 +465,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!mVV7a7KQAORoPMgZ.r1T70u9n3bRfUTX5.YznseQP43jNrk07h"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Oak_Treant_XK78QUfY8c8Go8Uv.json b/src/packs/adversaries/adversary_Oak_Treant_XK78QUfY8c8Go8Uv.json
index 82321fb6..c0999e70 100644
--- a/src/packs/adversaries/adversary_Oak_Treant_XK78QUfY8c8Go8Uv.json
+++ b/src/packs/adversaries/adversary_Oak_Treant_XK78QUfY8c8Go8Uv.json
@@ -399,26 +399,25 @@
               "type": "withinRange",
               "target": "any",
               "range": "self"
-            },
-            "changes": [
-              {
-                "key": "system.resistance.physical.resistance",
-                "value": 1,
-                "priority": null,
-                "type": "add"
-              }
-            ],
-            "duration": {
-              "type": "temporary",
-              "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;\">Can end this effect instead of moving while they are spotlighted.</span></p>"
             }
           },
+          "changes": [
+            {
+              "key": "system.resistance.physical.resistance",
+              "mode": 2,
+              "value": "1",
+              "priority": null
+            }
+          ],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "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>",
           "tint": "#ffffff",
@@ -428,16 +427,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!XK78QUfY8c8Go8Uv.sqkgw26P2KiQVtXT.3PY5KIG6d3dr3dty"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Outer_Realms_Abomination_A0SeeDzwjvqOsyof.json b/src/packs/adversaries/adversary_Outer_Realms_Abomination_A0SeeDzwjvqOsyof.json
index 83edda8a..5b565b8c 100644
--- a/src/packs/adversaries/adversary_Outer_Realms_Abomination_A0SeeDzwjvqOsyof.json
+++ b/src/packs/adversaries/adversary_Outer_Realms_Abomination_A0SeeDzwjvqOsyof.json
@@ -442,20 +442,20 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "scene"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
-          "description": "<p><span style=\"color:rgb(239, 230, 216);font-family:Signika, 'Palatino Linotype', 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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">Unstuck from reality until the end of the scene. When you spend Hope or mark Armor Slots, HP, or Stress, you must double the amount spent or marked.</span></p>",
+          "description": "<p><span style=\"color:rgb(239, 230, 216);font-family:Signika, 'Palatino Linotype', 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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">Unstuck from reality until the end of the scene. When you spend Hope or mark Armor Slots, HP, or Stress, you must double the amount spent or marked.</p>",
           "tint": "#ffffff",
           "statuses": [],
           "sort": 0,
@@ -463,16 +463,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!A0SeeDzwjvqOsyof.K3MQO1I42nmfM2F2.edEZER9ImWicMwRb"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Perfected_Zombie_CP6iRfHdyFWniTHY.json b/src/packs/adversaries/adversary_Perfected_Zombie_CP6iRfHdyFWniTHY.json
index 8174e9fd..e3da56b6 100644
--- a/src/packs/adversaries/adversary_Perfected_Zombie_CP6iRfHdyFWniTHY.json
+++ b/src/packs/adversaries/adversary_Perfected_Zombie_CP6iRfHdyFWniTHY.json
@@ -433,19 +433,18 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "shortRest",
-              "description": ""
             }
           },
+          "changes": [],
           "disabled": true,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "<p><em>Vulnerable</em> until your next rest.</p>",
           "tint": "#ffffff",
@@ -457,16 +456,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!CP6iRfHdyFWniTHY.CKy2r6FguyTSO9Fm.Q5eeh0B6qaXFS1Ck"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Red_Ooze_9rVlbJVrDNn1x7PS.json b/src/packs/adversaries/adversary_Red_Ooze_9rVlbJVrDNn1x7PS.json
index cd8a44b6..2c10ae3f 100644
--- a/src/packs/adversaries/adversary_Red_Ooze_9rVlbJVrDNn1x7PS.json
+++ b/src/packs/adversaries/adversary_Red_Ooze_9rVlbJVrDNn1x7PS.json
@@ -409,19 +409,18 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary",
-              "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;\">Until they’re extinguished with a successful Finesse Roll (14)</span></p>"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "<p>You are <em>Ignited</em> until you are extinguished with a successful Finesse Roll (14). While <em>Ignited</em>, you take <strong>1d4</strong> magic damage whenever you make an action roll.</p><p>[[/dr trait=finesse difficulty=14]]</p>",
           "tint": "#ffffff",
@@ -431,16 +430,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!9rVlbJVrDNn1x7PS.JU9uVwZSM0ItnZRq.9UBLk9M87VIUziAQ"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Siren_BK4jwyXSRx7IOQiO.json b/src/packs/adversaries/adversary_Siren_BK4jwyXSRx7IOQiO.json
index 05ca67a9..a72c6d46 100644
--- a/src/packs/adversaries/adversary_Siren_BK4jwyXSRx7IOQiO.json
+++ b/src/packs/adversaries/adversary_Siren_BK4jwyXSRx7IOQiO.json
@@ -408,21 +408,20 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary",
-              "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;\">Until you mark 2 Stress.</span></p>"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
-          "description": "<p>While Entranced, you can’t act and are <em>Vulnerable</em>.</p>",
+          "description": "<p>While Entranced, you can’t act and are <em>Vulnerable</em>. </p>",
           "tint": "#ffffff",
           "statuses": [
             "vulnerable"
@@ -432,16 +431,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!BK4jwyXSRx7IOQiO.Ks3HpB4W1l5FqR7p.xrm5786ckKbMYHjn"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Stonewraith_3aAS2Qm3R6cgaYfE.json b/src/packs/adversaries/adversary_Stonewraith_3aAS2Qm3R6cgaYfE.json
index d04f41fd..de3ef9f2 100644
--- a/src/packs/adversaries/adversary_Stonewraith_3aAS2Qm3R6cgaYfE.json
+++ b/src/packs/adversaries/adversary_Stonewraith_3aAS2Qm3R6cgaYfE.json
@@ -359,18 +359,18 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "",
           "tint": "#ffffff",
@@ -382,16 +382,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!3aAS2Qm3R6cgaYfE.tQgxiSS48TJ3X1Dl.6UgMuuJ8ZygbCsDh"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Tiny_Green_Ooze_aLkLFuVoKz2NLoBK.json b/src/packs/adversaries/adversary_Tiny_Green_Ooze_aLkLFuVoKz2NLoBK.json
index 2b3867aa..6a984b3c 100644
--- a/src/packs/adversaries/adversary_Tiny_Green_Ooze_aLkLFuVoKz2NLoBK.json
+++ b/src/packs/adversaries/adversary_Tiny_Green_Ooze_aLkLFuVoKz2NLoBK.json
@@ -128,9 +128,12 @@
       "src": "systems/daggerheart/assets/icons/documents/actors/dragon-head.svg",
       "anchorX": 0.5,
       "anchorY": 0.5,
+      "offsetX": 0,
+      "offsetY": 0,
       "fit": "contain",
       "scaleX": 1,
       "scaleY": 1,
+      "rotation": 0,
       "tint": "#ffffff",
       "alphaThreshold": 0.75
     },
@@ -181,7 +184,7 @@
       "saturation": 0,
       "contrast": 0
     },
-    "detectionModes": {},
+    "detectionModes": [],
     "occludable": {
       "radius": 0
     },
@@ -207,8 +210,7 @@
     "flags": {},
     "randomImg": false,
     "appendNumber": false,
-    "prependAdjective": false,
-    "depth": 1
+    "prependAdjective": false
   },
   "items": [
     {
@@ -217,7 +219,7 @@
       "_id": "WpOh5kHHx7lcTvEY",
       "img": "icons/magic/acid/dissolve-drip-droplet-smoke.webp",
       "system": {
-        "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>",
+        "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": {
diff --git a/src/packs/adversaries/adversary_Vault_Guardian_Gaoler_JqYraOqNmmhHk4Yy.json b/src/packs/adversaries/adversary_Vault_Guardian_Gaoler_JqYraOqNmmhHk4Yy.json
index 24db9c55..d1cca592 100644
--- a/src/packs/adversaries/adversary_Vault_Guardian_Gaoler_JqYraOqNmmhHk4Yy.json
+++ b/src/packs/adversaries/adversary_Vault_Guardian_Gaoler_JqYraOqNmmhHk4Yy.json
@@ -328,21 +328,20 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary",
-              "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;\">Until freed with a successful Strength Roll (18).</span></p>"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
-          "description": "<p>You are<strong> </strong><em>Restrained</em> within the Gaoler until freed with a successful Strength Roll (18). While <em>Restrained</em>, you can only attack the Gaoler.</p>",
+          "description": "<p>You are<strong> </strong><em>Restrained</em> within the Gaoler until freed with a successful Strength Roll (18). While <em>Restrained</em>, you can only attack the Gaoler. </p>",
           "tint": "#ffffff",
           "statuses": [
             "restrained"
@@ -352,16 +351,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!JqYraOqNmmhHk4Yy.VlHp8RjHy7MK8rqC.6TZlstmWJPbeoL7i"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Vault_Guardian_Sentinel_FVgYb28fhxlVcGwA.json b/src/packs/adversaries/adversary_Vault_Guardian_Sentinel_FVgYb28fhxlVcGwA.json
index e4098e93..67139669 100644
--- a/src/packs/adversaries/adversary_Vault_Guardian_Sentinel_FVgYb28fhxlVcGwA.json
+++ b/src/packs/adversaries/adversary_Vault_Guardian_Sentinel_FVgYb28fhxlVcGwA.json
@@ -132,9 +132,12 @@
       "src": "systems/daggerheart/assets/icons/documents/actors/dragon-head.svg",
       "anchorX": 0.5,
       "anchorY": 0.5,
+      "offsetX": 0,
+      "offsetY": 0,
       "fit": "contain",
       "scaleX": 1,
       "scaleY": 1,
+      "rotation": 0,
       "tint": "#ffffff",
       "alphaThreshold": 0.75
     },
@@ -185,7 +188,7 @@
       "saturation": 0,
       "contrast": 0
     },
-    "detectionModes": {},
+    "detectionModes": [],
     "occludable": {
       "radius": 0
     },
@@ -211,8 +214,7 @@
     "flags": {},
     "randomImg": false,
     "appendNumber": false,
-    "prependAdjective": false,
-    "depth": 1
+    "prependAdjective": false
   },
   "items": [
     {
@@ -244,7 +246,7 @@
       "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 @Lookup[@name]. The @Lookup[@name] 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": {
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 baf84c14..82bdd810 100644
--- a/src/packs/adversaries/adversary_Volcanic_Dragon__Ashen_Tyrant_pMuXGCSOQaxpi5tb.json
+++ b/src/packs/adversaries/adversary_Volcanic_Dragon__Ashen_Tyrant_pMuXGCSOQaxpi5tb.json
@@ -841,19 +841,18 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary",
-              "description": "<p>Until you break free with a successful Strength Roll.</p>"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "<p><em>Restrained</em> by the rubble until you break free with a successful Strength Roll.</p>",
           "tint": "#ffffff",
@@ -865,16 +864,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!pMuXGCSOQaxpi5tb.uWiyaJPXcoW06pOM.YUjdwrEZ4zn7WR9X"
         }
       ],
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 c73b0dda..b23da064 100644
--- a/src/packs/adversaries/adversary_Volcanic_Dragon__Molten_Scourge_eArAPuB38CNR0ZIM.json
+++ b/src/packs/adversaries/adversary_Volcanic_Dragon__Molten_Scourge_eArAPuB38CNR0ZIM.json
@@ -721,19 +721,18 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary",
-              "description": "<p>Until you clear a Stress.</p>"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "<p><em>Vulnerable</em> until you clear a Stress.</p>",
           "tint": "#ffffff",
@@ -745,16 +744,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!eArAPuB38CNR0ZIM.2mK8kxfp2WBUeBri.xmzA6NC9zrulhzQs"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Weaponmaster_ZNbQ2jg35LG4t9eH.json b/src/packs/adversaries/adversary_Weaponmaster_ZNbQ2jg35LG4t9eH.json
index 55c7cb23..2989468b 100644
--- a/src/packs/adversaries/adversary_Weaponmaster_ZNbQ2jg35LG4t9eH.json
+++ b/src/packs/adversaries/adversary_Weaponmaster_ZNbQ2jg35LG4t9eH.json
@@ -324,19 +324,18 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary",
-              "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;\">Until your next successful attack</span></p>"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "<p>The next time the Taunted target attacks, they have disadvantage against targets other than the Weaponmaster.</p>",
           "tint": "#ffffff",
@@ -346,16 +345,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!ZNbQ2jg35LG4t9eH.tyGgOqQzDSIypoMz.j2jYmYbtWXvq32yX"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Young_Dryad_8yUj2Mzvnifhxegm.json b/src/packs/adversaries/adversary_Young_Dryad_8yUj2Mzvnifhxegm.json
index d097f765..446a4af3 100644
--- a/src/packs/adversaries/adversary_Young_Dryad_8yUj2Mzvnifhxegm.json
+++ b/src/packs/adversaries/adversary_Young_Dryad_8yUj2Mzvnifhxegm.json
@@ -367,21 +367,20 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary",
-              "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;\">Until they’re freed with a successful Strength Roll.</span></p>"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
-          "description": "<p>You are <em>Restrained</em> until you're freed with a successful Strength Roll. When a creature makes an action roll against the cage, they must mark a Stress.</p>",
+          "description": "<p>You are <em>Restrained</em> until you're freed with a successful Strength Roll. When a creature makes an action roll against the cage, they must mark a Stress. </p>",
           "tint": "#ffffff",
           "statuses": [
             "restrained"
@@ -391,16 +390,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!8yUj2Mzvnifhxegm.i8NoUGUTNY2C5NhC.k8LzBWRZo6VPqvpH"
         }
       ],
diff --git a/src/packs/adversaries/adversary_Young_Ice_Dragon_UGPiPLJsPvMTSKEF.json b/src/packs/adversaries/adversary_Young_Ice_Dragon_UGPiPLJsPvMTSKEF.json
index a40f57f0..b0a3bded 100644
--- a/src/packs/adversaries/adversary_Young_Ice_Dragon_UGPiPLJsPvMTSKEF.json
+++ b/src/packs/adversaries/adversary_Young_Ice_Dragon_UGPiPLJsPvMTSKEF.json
@@ -621,19 +621,18 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary",
-              "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;\">Until they dig themselves out from the debris.</span></p>"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "<p><em>Vulnerable</em> until you dig yourself out from the debris.</p>",
           "tint": "#ffffff",
@@ -645,16 +644,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!UGPiPLJsPvMTSKEF.CcRTxCDCJskiu3fI.40cFHuNdEvbUZ9rs"
         }
       ],
@@ -755,26 +744,25 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [
-              {
-                "key": "system.disadvantageSources",
-                "value": "On attack rolls.",
-                "priority": null,
-                "type": "add"
-              }
-            ],
-            "duration": {
-              "type": "temporary",
-              "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;\">Until your next rest or you clear a Stress.</span></p>"
             }
           },
+          "changes": [
+            {
+              "key": "system.disadvantageSources",
+              "mode": 2,
+              "value": "On attack rolls.",
+              "priority": null
+            }
+          ],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "<p>Chilled until your next rest or you clear a Stress. While you are Chilled, you have disadvantage on attack rolls.</p>",
           "tint": "#ffffff",
@@ -784,16 +772,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!UGPiPLJsPvMTSKEF.nXZHOfcYvjg3YMNU.1JlRxa07i8T1a9x6"
         }
       ],
diff --git a/src/packs/ancestries/feature_Retracting_Claws_Zj69cAeb3NjIa8Hn.json b/src/packs/ancestries/feature_Retracting_Claws_Zj69cAeb3NjIa8Hn.json
index 6338548e..8e408ec6 100644
--- a/src/packs/ancestries/feature_Retracting_Claws_Zj69cAeb3NjIa8Hn.json
+++ b/src/packs/ancestries/feature_Retracting_Claws_Zj69cAeb3NjIa8Hn.json
@@ -83,18 +83,18 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [],
-        "duration": {
-          "type": "temporary"
         }
       },
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "",
       "tint": "#ffffff",
@@ -106,16 +106,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!Zj69cAeb3NjIa8Hn.pO76svFkmWmZ6LjC"
     }
   ],
diff --git a/src/packs/beastforms/feature_Demolish_DfBXO8jTchwFG8dZ.json b/src/packs/beastforms/feature_Demolish_DfBXO8jTchwFG8dZ.json
index acc7df36..b7d85ef1 100644
--- a/src/packs/beastforms/feature_Demolish_DfBXO8jTchwFG8dZ.json
+++ b/src/packs/beastforms/feature_Demolish_DfBXO8jTchwFG8dZ.json
@@ -107,18 +107,17 @@
       "transfer": false,
       "_id": "FXdFgEgqVl5gIWJS",
       "type": "base",
-      "system": {
-        "changes": [],
-        "duration": {
-          "type": "temporary"
-        }
-      },
+      "system": {},
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "",
       "tint": "#ffffff",
@@ -130,16 +129,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!DfBXO8jTchwFG8dZ.FXdFgEgqVl5gIWJS"
     }
   ],
diff --git a/src/packs/beastforms/feature_Hobbling_Strike_8u0HkK3WgtU9lWYs.json b/src/packs/beastforms/feature_Hobbling_Strike_8u0HkK3WgtU9lWYs.json
index a1d80e5d..6a16f864 100644
--- a/src/packs/beastforms/feature_Hobbling_Strike_8u0HkK3WgtU9lWYs.json
+++ b/src/packs/beastforms/feature_Hobbling_Strike_8u0HkK3WgtU9lWYs.json
@@ -58,18 +58,17 @@
       "transfer": false,
       "_id": "2kKkV9zhfvqA2vlt",
       "type": "base",
-      "system": {
-        "changes": [],
-        "duration": {
-          "type": "temporary"
-        }
-      },
+      "system": {},
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "",
       "tint": "#ffffff",
@@ -81,16 +80,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!8u0HkK3WgtU9lWYs.2kKkV9zhfvqA2vlt"
     }
   ],
diff --git a/src/packs/beastforms/feature_Ocean_Master_tGDdEH40wyOCsFmH.json b/src/packs/beastforms/feature_Ocean_Master_tGDdEH40wyOCsFmH.json
index aa0baa31..a4431417 100644
--- a/src/packs/beastforms/feature_Ocean_Master_tGDdEH40wyOCsFmH.json
+++ b/src/packs/beastforms/feature_Ocean_Master_tGDdEH40wyOCsFmH.json
@@ -51,18 +51,17 @@
       "transfer": false,
       "_id": "6GBczj8REkDmgX2Q",
       "type": "base",
-      "system": {
-        "changes": [],
-        "duration": {
-          "type": "temporary"
-        }
-      },
+      "system": {},
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "",
       "tint": "#ffffff",
@@ -74,16 +73,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!tGDdEH40wyOCsFmH.6GBczj8REkDmgX2Q"
     }
   ],
diff --git a/src/packs/beastforms/feature_Snapping_Strike_Ky3rZD3sJMXYZOBC.json b/src/packs/beastforms/feature_Snapping_Strike_Ky3rZD3sJMXYZOBC.json
index 581bdcf5..d79c9018 100644
--- a/src/packs/beastforms/feature_Snapping_Strike_Ky3rZD3sJMXYZOBC.json
+++ b/src/packs/beastforms/feature_Snapping_Strike_Ky3rZD3sJMXYZOBC.json
@@ -58,18 +58,17 @@
       "transfer": false,
       "_id": "y3EsJuInxE7juNXT",
       "type": "base",
-      "system": {
-        "changes": [],
-        "duration": {
-          "type": "temporary"
-        }
-      },
+      "system": {},
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "",
       "tint": "#ffffff",
@@ -82,16 +81,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!Ky3rZD3sJMXYZOBC.y3EsJuInxE7juNXT"
     }
   ],
diff --git a/src/packs/beastforms/feature_Trample_A0lgd6eVEfX6oqSB.json b/src/packs/beastforms/feature_Trample_A0lgd6eVEfX6oqSB.json
index 230f6470..e9878f02 100644
--- a/src/packs/beastforms/feature_Trample_A0lgd6eVEfX6oqSB.json
+++ b/src/packs/beastforms/feature_Trample_A0lgd6eVEfX6oqSB.json
@@ -107,18 +107,17 @@
       "transfer": false,
       "_id": "LkekG4IngVW9rFjI",
       "type": "base",
-      "system": {
-        "changes": [],
-        "duration": {
-          "type": "temporary"
-        }
-      },
+      "system": {},
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "",
       "tint": "#ffffff",
@@ -130,16 +129,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!A0lgd6eVEfX6oqSB.LkekG4IngVW9rFjI"
     }
   ],
diff --git a/src/packs/beastforms/feature_Venomous_Bite_2KlTnfzO03vneVS8.json b/src/packs/beastforms/feature_Venomous_Bite_2KlTnfzO03vneVS8.json
index 30ace68f..00870086 100644
--- a/src/packs/beastforms/feature_Venomous_Bite_2KlTnfzO03vneVS8.json
+++ b/src/packs/beastforms/feature_Venomous_Bite_2KlTnfzO03vneVS8.json
@@ -51,18 +51,17 @@
       "transfer": false,
       "_id": "TTyAKKoUCoYXSMs4",
       "type": "base",
-      "system": {
-        "changes": [],
-        "duration": {
-          "type": "temporary"
-        }
-      },
+      "system": {},
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">A Poisoned creature takes </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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\"><strong>1d10</strong></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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\"> direct physical damage each time they act.</span></p>",
       "tint": "#ffffff",
@@ -72,16 +71,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!2KlTnfzO03vneVS8.TTyAKKoUCoYXSMs4"
     }
   ],
diff --git a/src/packs/beastforms/feature_Venomous_Strike_uW3853pViM9VAfHb.json b/src/packs/beastforms/feature_Venomous_Strike_uW3853pViM9VAfHb.json
index 3b39707d..57d5bb56 100644
--- a/src/packs/beastforms/feature_Venomous_Strike_uW3853pViM9VAfHb.json
+++ b/src/packs/beastforms/feature_Venomous_Strike_uW3853pViM9VAfHb.json
@@ -75,18 +75,17 @@
       "transfer": false,
       "_id": "1iQPj96LqUNkRaxE",
       "type": "base",
-      "system": {
-        "changes": [],
-        "duration": {
-          "type": "temporary"
-        }
-      },
+      "system": {},
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "<p>A Poisoned creature takes <strong>1d10</strong> physical direct damage each time they act.</p>",
       "tint": "#ffffff",
@@ -96,16 +95,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!uW3853pViM9VAfHb.1iQPj96LqUNkRaxE"
     }
   ],
diff --git a/src/packs/beastforms/feature_Vicious_Maul_jYUBi7yLHap5ljpa.json b/src/packs/beastforms/feature_Vicious_Maul_jYUBi7yLHap5ljpa.json
index 28095ea9..2bdad760 100644
--- a/src/packs/beastforms/feature_Vicious_Maul_jYUBi7yLHap5ljpa.json
+++ b/src/packs/beastforms/feature_Vicious_Maul_jYUBi7yLHap5ljpa.json
@@ -88,18 +88,17 @@
       "transfer": false,
       "_id": "MIAh9XNwDXGDktCm",
       "type": "base",
-      "system": {
-        "changes": [],
-        "duration": {
-          "type": "temporary"
-        }
-      },
+      "system": {},
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "",
       "tint": "#ffffff",
@@ -111,16 +110,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!jYUBi7yLHap5ljpa.MIAh9XNwDXGDktCm"
     }
   ],
diff --git a/src/packs/beastforms/feature_Webslinger_D73fS1iM4SZPFimu.json b/src/packs/beastforms/feature_Webslinger_D73fS1iM4SZPFimu.json
index 9e3a3d93..40adb28b 100644
--- a/src/packs/beastforms/feature_Webslinger_D73fS1iM4SZPFimu.json
+++ b/src/packs/beastforms/feature_Webslinger_D73fS1iM4SZPFimu.json
@@ -75,18 +75,17 @@
       "transfer": false,
       "_id": "cBJueH89gNvvDKfQ",
       "type": "base",
-      "system": {
-        "changes": [],
-        "duration": {
-          "type": "temporary"
-        }
-      },
+      "system": {},
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "",
       "tint": "#ffffff",
@@ -98,16 +97,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!D73fS1iM4SZPFimu.cBJueH89gNvvDKfQ"
     }
   ],
diff --git a/src/packs/classes/feature_Make_a_Scene_N9E5skDDK2VgvohR.json b/src/packs/classes/feature_Make_a_Scene_N9E5skDDK2VgvohR.json
index 5f28c048..1a444728 100644
--- a/src/packs/classes/feature_Make_a_Scene_N9E5skDDK2VgvohR.json
+++ b/src/packs/classes/feature_Make_a_Scene_N9E5skDDK2VgvohR.json
@@ -53,7 +53,7 @@
   "effects": [
     {
       "name": "Make a Scene",
-      "img": "icons/magic/sonic/scream-wail-shout-teal.webp",
+      "img": "icons/svg/daze.svg",
       "origin": "Compendium.daggerheart.classes.Item.OxmucTHHfuBSv2dn",
       "transfer": false,
       "_id": "8G9zDv1gac6dEHmS",
@@ -64,27 +64,27 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [
-          {
-            "key": "system.difficulty",
-            "value": -2,
-            "priority": null,
-            "type": "add"
-          }
-        ],
-        "duration": {
-          "type": "temporary"
         }
       },
+      "changes": [
+        {
+          "key": "system.difficulty",
+          "mode": 2,
+          "value": "-2",
+          "priority": null
+        }
+      ],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
-      "description": "<p>Giving them a -2 penalty to their Difficulty.</p>",
+      "description": "",
       "tint": "#ffffff",
       "statuses": [],
       "sort": 0,
@@ -92,16 +92,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!N9E5skDDK2VgvohR.8G9zDv1gac6dEHmS"
     }
   ],
diff --git a/src/packs/classes/feature_No_Mercy_njj2C3tMDeCHHOoh.json b/src/packs/classes/feature_No_Mercy_njj2C3tMDeCHHOoh.json
index b5239242..4d10c3b9 100644
--- a/src/packs/classes/feature_No_Mercy_njj2C3tMDeCHHOoh.json
+++ b/src/packs/classes/feature_No_Mercy_njj2C3tMDeCHHOoh.json
@@ -67,25 +67,25 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [
-          {
-            "key": "system.bonuses.roll.attack.bonus",
-            "value": 1,
-            "priority": null,
-            "type": "add"
-          }
-        ],
-        "duration": {
-          "type": "shortRest"
         }
       },
+      "changes": [
+        {
+          "key": "system.bonuses.roll.attack.bonus",
+          "mode": 2,
+          "value": "1",
+          "priority": null
+        }
+      ],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "<p><strong>G</strong>ain a +1 bonus to your attack rolls until your next rest.</p>",
       "tint": "#ffffff",
@@ -95,16 +95,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!njj2C3tMDeCHHOoh.XK4cCcz9sRGDJr0q"
     }
   ],
diff --git a/src/packs/classes/feature_Rogue_s_Dodge_hVaaPIjxoextIgSL.json b/src/packs/classes/feature_Rogue_s_Dodge_hVaaPIjxoextIgSL.json
index 0f31f491..231295fc 100644
--- a/src/packs/classes/feature_Rogue_s_Dodge_hVaaPIjxoextIgSL.json
+++ b/src/packs/classes/feature_Rogue_s_Dodge_hVaaPIjxoextIgSL.json
@@ -65,26 +65,25 @@
           "type": "withinRange",
           "target": "any",
           "range": "self"
-        },
-        "changes": [
-          {
-            "key": "system.evasion",
-            "value": 2,
-            "priority": null,
-            "type": "add"
-          }
-        ],
-        "duration": {
-          "type": "temporary",
-          "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;\">Until the next time an attack succeeds against you.</span></p>"
         }
       },
+      "changes": [
+        {
+          "key": "system.evasion",
+          "mode": 2,
+          "value": "2",
+          "priority": null
+        }
+      ],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "<p><strong>Spend 3 Hope</strong> to gain a +2 bonus to your Evasion until the next time an attack succeeds against you. Otherwise, this bonus lasts until your next rest.</p>",
       "tint": "#ffffff",
@@ -94,16 +93,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!hVaaPIjxoextIgSL.hhVjBro2osGDTT5g"
     }
   ],
diff --git a/src/packs/domains/domainCard_Bolt_Beacon_BNevJyGk7hmN7XOY.json b/src/packs/domains/domainCard_Bolt_Beacon_BNevJyGk7hmN7XOY.json
index c1964896..eb053b27 100644
--- a/src/packs/domains/domainCard_Bolt_Beacon_BNevJyGk7hmN7XOY.json
+++ b/src/packs/domains/domainCard_Bolt_Beacon_BNevJyGk7hmN7XOY.json
@@ -119,20 +119,20 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [],
-        "duration": {
-          "type": "temporary"
         }
       },
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
-      "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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">Temporarily </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-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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\">Vulnerable</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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\"> and glows brightly until this condition is cleared.</span></p>",
+      "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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">Temporarily </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-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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\">Vulnerable</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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\"> and glows brightly until this condition is cleared.</p>",
       "tint": "#ffffff",
       "statuses": [
         "vulnerable"
@@ -142,16 +142,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!BNevJyGk7hmN7XOY.veZpnhnF8NRRhKG4"
     }
   ],
diff --git a/src/packs/domains/domainCard_Book_of_Ava_YtZzYBtR0yLPPA93.json b/src/packs/domains/domainCard_Book_of_Ava_YtZzYBtR0yLPPA93.json
index 790249be..da2d75f1 100644
--- a/src/packs/domains/domainCard_Book_of_Ava_YtZzYBtR0yLPPA93.json
+++ b/src/packs/domains/domainCard_Book_of_Ava_YtZzYBtR0yLPPA93.json
@@ -255,12 +255,6 @@
       "_id": "ptYT10JZ2WJHvFMd",
       "type": "armor",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [
           {
             "key": "system.armorScore",
@@ -270,10 +264,7 @@
             "value": 0,
             "max": "1"
           }
-        ],
-        "duration": {
-          "type": "shortRest"
-        }
+        ]
       },
       "disabled": false,
       "duration": {
@@ -290,14 +281,7 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
+      "start": null,
       "showIcon": 1,
       "folder": null,
       "_key": "!items.effects!YtZzYBtR0yLPPA93.ptYT10JZ2WJHvFMd"
diff --git a/src/packs/domains/domainCard_Book_of_Illiat_df4iRqQzRntrF6Qw.json b/src/packs/domains/domainCard_Book_of_Illiat_df4iRqQzRntrF6Qw.json
index 71ce49f6..5acec2fd 100644
--- a/src/packs/domains/domainCard_Book_of_Illiat_df4iRqQzRntrF6Qw.json
+++ b/src/packs/domains/domainCard_Book_of_Illiat_df4iRqQzRntrF6Qw.json
@@ -177,18 +177,18 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [],
-        "duration": {
-          "type": "shortRest"
         }
       },
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "<p>Lasts until your next rest or the caster casts Telepathy again.</p>",
       "tint": "#ffffff",
@@ -198,16 +198,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!df4iRqQzRntrF6Qw.zAEaETYSOE2fmcyB"
     },
     {
@@ -223,19 +213,18 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [],
-        "duration": {
-          "type": "temporary",
-          "description": "<p>Until they take damage or the GM spends a Fear on their turn to clear this condition.</p>"
         }
       },
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "<p>Asleep until they take damage or the GM spends a Fear on their turn to clear this condition.</p>",
       "tint": "#ffffff",
@@ -245,16 +234,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!df4iRqQzRntrF6Qw.gfZTHSgwYSDKsePW"
     }
   ],
diff --git a/src/packs/domains/domainCard_Book_of_Norai_WtwSWXTRZa7QVvmo.json b/src/packs/domains/domainCard_Book_of_Norai_WtwSWXTRZa7QVvmo.json
index 05d0a219..6581cd52 100644
--- a/src/packs/domains/domainCard_Book_of_Norai_WtwSWXTRZa7QVvmo.json
+++ b/src/packs/domains/domainCard_Book_of_Norai_WtwSWXTRZa7QVvmo.json
@@ -184,18 +184,18 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [],
-        "duration": {
-          "type": "temporary"
         }
       },
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "",
       "tint": "#ffffff",
@@ -207,16 +207,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!WtwSWXTRZa7QVvmo.iPnT02apql16Zhjf"
     }
   ],
diff --git a/src/packs/domains/domainCard_Book_of_Yarrow_J1ovx2FpNDvPq1o6.json b/src/packs/domains/domainCard_Book_of_Yarrow_J1ovx2FpNDvPq1o6.json
index 4e08fb0e..2a48b31e 100644
--- a/src/packs/domains/domainCard_Book_of_Yarrow_J1ovx2FpNDvPq1o6.json
+++ b/src/packs/domains/domainCard_Book_of_Yarrow_J1ovx2FpNDvPq1o6.json
@@ -114,25 +114,25 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [
-          {
-            "key": "system.resistance.magical.immunity",
-            "value": 1,
-            "priority": null,
-            "type": "override"
-          }
-        ],
-        "duration": {
-          "type": "shortRest"
         }
       },
+      "changes": [
+        {
+          "key": "system.resistance.magical.immunity",
+          "mode": 5,
+          "value": "1",
+          "priority": null
+        }
+      ],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "<p class=\"Card-Feature\"><strong>I</strong>mmune to magic damage until your next rest.</p>",
       "tint": "#ffffff",
@@ -142,16 +142,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!J1ovx2FpNDvPq1o6.HWJYhSegVLeAa3dE"
     }
   ],
diff --git a/src/packs/domains/domainCard_Cinder_Grasp_5EP2Lgf7ojfrc0Is.json b/src/packs/domains/domainCard_Cinder_Grasp_5EP2Lgf7ojfrc0Is.json
index 5ffab1e2..8ea51d7f 100644
--- a/src/packs/domains/domainCard_Cinder_Grasp_5EP2Lgf7ojfrc0Is.json
+++ b/src/packs/domains/domainCard_Cinder_Grasp_5EP2Lgf7ojfrc0Is.json
@@ -167,18 +167,18 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [],
-        "duration": {
-          "type": "temporary"
         }
       },
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "<p>When a creature acts while <em>On Fire</em>, they must take an extra <strong>2d6</strong> magic damage if they are still <em>On Fire</em> at the end of their action.</p>",
       "tint": "#ffffff",
@@ -190,16 +190,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!5EP2Lgf7ojfrc0Is.HNKkaWi507whJuYN"
     }
   ],
diff --git a/src/packs/domains/domainCard_Cloaking_Blast_Zhw7PtK8nMPlsOqD.json b/src/packs/domains/domainCard_Cloaking_Blast_Zhw7PtK8nMPlsOqD.json
index a2a06889..67817fc1 100644
--- a/src/packs/domains/domainCard_Cloaking_Blast_Zhw7PtK8nMPlsOqD.json
+++ b/src/packs/domains/domainCard_Cloaking_Blast_Zhw7PtK8nMPlsOqD.json
@@ -70,19 +70,18 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [],
-        "duration": {
-          "type": "temporary",
-          "description": "<p>When you move into or within an adversary’s line of sight or make an attack, you are no longer Cloaked.</p>"
         }
       },
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "<p>While <em>Cloaked</em>, you remain unseen if you are stationary when an adversary moves to where they would normally see you. When you move into or within an adversary’s line of sight or make an attack, you are no longer <em>Cloaked</em>.</p>",
       "tint": "#ffffff",
@@ -92,16 +91,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!Zhw7PtK8nMPlsOqD.twCBqXytmRkMz0kV"
     }
   ],
diff --git a/src/packs/domains/domainCard_Earthquake_C0qLOwSSvZ6PG3Ws.json b/src/packs/domains/domainCard_Earthquake_C0qLOwSSvZ6PG3Ws.json
index 614f7e32..57fc72db 100644
--- a/src/packs/domains/domainCard_Earthquake_C0qLOwSSvZ6PG3Ws.json
+++ b/src/packs/domains/domainCard_Earthquake_C0qLOwSSvZ6PG3Ws.json
@@ -123,20 +123,20 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [],
-        "duration": {
-          "type": "temporary"
         }
       },
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
-      "description": "<p>Temporarily Vulnerable.</p>",
+      "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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">Temporarily </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-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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\">Vulnerable</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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">.</p>",
       "tint": "#ffffff",
       "statuses": [],
       "sort": 0,
@@ -144,16 +144,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!C0qLOwSSvZ6PG3Ws.Z31XqmGUKWYcZdMY"
     }
   ],
diff --git a/src/packs/domains/domainCard_Enrapture_a8lFiKX1o8T924ze.json b/src/packs/domains/domainCard_Enrapture_a8lFiKX1o8T924ze.json
index dc574dec..fd27c8ce 100644
--- a/src/packs/domains/domainCard_Enrapture_a8lFiKX1o8T924ze.json
+++ b/src/packs/domains/domainCard_Enrapture_a8lFiKX1o8T924ze.json
@@ -144,18 +144,18 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [],
-        "duration": {
-          "type": "temporary"
         }
       },
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "<p>While <em>Enraptured</em>, a target’s attention is fixed on you, narrowing their field of view and drowning out any sound but your voice.</p>",
       "tint": "#ffffff",
@@ -165,16 +165,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!a8lFiKX1o8T924ze.EYG5dLImk6GkmfRd"
     }
   ],
diff --git a/src/packs/domains/domainCard_Forceful_Push_z8FFPhDh2SdFkFfS.json b/src/packs/domains/domainCard_Forceful_Push_z8FFPhDh2SdFkFfS.json
index 3d17ab5d..d77c8777 100644
--- a/src/packs/domains/domainCard_Forceful_Push_z8FFPhDh2SdFkFfS.json
+++ b/src/packs/domains/domainCard_Forceful_Push_z8FFPhDh2SdFkFfS.json
@@ -69,18 +69,18 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [],
-        "duration": {
-          "type": "temporary"
         }
       },
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "",
       "tint": "#ffffff",
@@ -92,16 +92,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!z8FFPhDh2SdFkFfS.95oX6QYPySdyyh2v"
     }
   ],
diff --git a/src/packs/domains/domainCard_Frenzy_MMl7abdGRLl7TJLO.json b/src/packs/domains/domainCard_Frenzy_MMl7abdGRLl7TJLO.json
index 6666bc28..2de4be7e 100644
--- a/src/packs/domains/domainCard_Frenzy_MMl7abdGRLl7TJLO.json
+++ b/src/packs/domains/domainCard_Frenzy_MMl7abdGRLl7TJLO.json
@@ -62,44 +62,43 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [
-          {
-            "key": "system.bonuses.damage.physical.bonus",
-            "value": 10,
-            "priority": null,
-            "type": "add"
-          },
-          {
-            "key": "system.bonuses.damage.magical.bonus",
-            "value": 10,
-            "priority": null,
-            "type": "add"
-          },
-          {
-            "key": "system.damageThresholds.severe",
-            "value": 8,
-            "priority": null,
-            "type": "add"
-          },
-          {
-            "key": "system.rules.damageReduction.disabledArmor",
-            "value": 1,
-            "priority": null,
-            "type": "override"
-          }
-        ],
-        "duration": {
-          "type": "temporary",
-          "description": "<p>Until there are no more adversaries within sight.</p>"
         }
       },
+      "changes": [
+        {
+          "key": "system.bonuses.damage.physical.bonus",
+          "mode": 2,
+          "value": "10",
+          "priority": null
+        },
+        {
+          "key": "system.bonuses.damage.magical.bonus",
+          "mode": 2,
+          "value": "10",
+          "priority": null
+        },
+        {
+          "key": "system.damageThresholds.severe",
+          "mode": 2,
+          "value": "8",
+          "priority": null
+        },
+        {
+          "key": "system.rules.damageReduction.disabledArmor",
+          "mode": 5,
+          "value": "1",
+          "priority": null
+        }
+      ],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "<p class=\"Body-Foundation\">Once per long rest, you can go into a <em>Frenzy</em> until there are no more adversaries within sight.</p><p class=\"Body-Foundation\">While <em>Frenzied</em>, you can’t use Armor Slots, and you gain a +10 bonus to your damage rolls and a +8 bonus to your Severe damage threshold.</p>",
       "tint": "#ffffff",
@@ -109,16 +108,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!MMl7abdGRLl7TJLO.1POoAgObPOWDpUco"
     }
   ],
diff --git a/src/packs/domains/domainCard_Full_Surge_SgvjJfMyubZowPxS.json b/src/packs/domains/domainCard_Full_Surge_SgvjJfMyubZowPxS.json
index fb0bd16d..43b4baf4 100644
--- a/src/packs/domains/domainCard_Full_Surge_SgvjJfMyubZowPxS.json
+++ b/src/packs/domains/domainCard_Full_Surge_SgvjJfMyubZowPxS.json
@@ -68,57 +68,57 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [
-          {
-            "key": "system.traits.strength.value",
-            "value": 2,
-            "priority": null,
-            "type": "add"
-          },
-          {
-            "key": "system.traits.agility.value",
-            "value": 2,
-            "priority": null,
-            "type": "add"
-          },
-          {
-            "key": "system.traits.finesse.value",
-            "value": 2,
-            "priority": null,
-            "type": "add"
-          },
-          {
-            "key": "system.traits.instinct.value",
-            "value": 2,
-            "priority": null,
-            "type": "add"
-          },
-          {
-            "key": "system.traits.presence.value",
-            "value": 2,
-            "priority": null,
-            "type": "add"
-          },
-          {
-            "key": "system.traits.knowledge.value",
-            "value": 2,
-            "priority": null,
-            "type": "add"
-          }
-        ],
-        "duration": {
-          "type": "shortRest"
         }
       },
+      "changes": [
+        {
+          "key": "system.traits.strength.value",
+          "mode": 2,
+          "value": "2",
+          "priority": null
+        },
+        {
+          "key": "system.traits.agility.value",
+          "mode": 2,
+          "value": "2",
+          "priority": null
+        },
+        {
+          "key": "system.traits.finesse.value",
+          "mode": 2,
+          "value": "2",
+          "priority": null
+        },
+        {
+          "key": "system.traits.instinct.value",
+          "mode": 2,
+          "value": "2",
+          "priority": null
+        },
+        {
+          "key": "system.traits.presence.value",
+          "mode": 2,
+          "value": "2",
+          "priority": null
+        },
+        {
+          "key": "system.traits.knowledge.value",
+          "mode": 2,
+          "value": "2",
+          "priority": null
+        }
+      ],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
-      "description": "<p>Gain a +2 bonus to all of your character traits until your next rest.</p>",
+      "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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">Gain a +2 bonus to all of your </span><span class=\"tooltip-convert\" 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;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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\">character traits</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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\"> until your next rest.</p>",
       "tint": "#ffffff",
       "statuses": [],
       "sort": 0,
@@ -126,16 +126,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!SgvjJfMyubZowPxS.H5q5iYImr69TfZcp"
     }
   ],
diff --git a/src/packs/domains/domainCard_Glyph_of_Nightfall_B5HXqYRJiL3xMNKT.json b/src/packs/domains/domainCard_Glyph_of_Nightfall_B5HXqYRJiL3xMNKT.json
index 3c17d4ee..ef2b6df9 100644
--- a/src/packs/domains/domainCard_Glyph_of_Nightfall_B5HXqYRJiL3xMNKT.json
+++ b/src/packs/domains/domainCard_Glyph_of_Nightfall_B5HXqYRJiL3xMNKT.json
@@ -41,7 +41,7 @@
         },
         "effects": [
           {
-            "_id": "9avDhppIdTqAR56f",
+            "_id": "X2w3kRHaETs8YWLO",
             "onSave": false
           }
         ],
@@ -82,25 +82,12 @@
   "effects": [
     {
       "name": "Glyph of Nightfall",
-      "img": "systems/daggerheart/assets/icons/domains/domain-card/midnight.png",
+      "img": "icons/magic/symbols/runes-triangle-magenta.webp",
       "origin": "Compendium.daggerheart.domains.Item.B5HXqYRJiL3xMNKT",
       "transfer": false,
-      "_id": "9avDhppIdTqAR56f",
+      "_id": "st8Ji9ZNexvw64xM",
       "type": "base",
       "system": {
-        "changes": [
-          {
-            "key": "system.difficulty",
-            "type": "add",
-            "value": "-max(ORIGIN.@system.traits.knowledge.value,1)",
-            "priority": null,
-            "phase": "initial"
-          }
-        ],
-        "duration": {
-          "description": "",
-          "type": "temporary"
-        },
         "rangeDependence": {
           "enabled": false,
           "type": "withinRange",
@@ -108,32 +95,76 @@
           "range": "melee"
         }
       },
+      "changes": [
+        {
+          "key": "system.difficulty",
+          "mode": 2,
+          "value": "-max(ORIGIN.@system.traits.knowledge.value,1)",
+          "priority": null
+        }
+      ],
       "disabled": false,
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
-      "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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline !important\">Conjure a dark glyph upon their body that exposes their weak points, temporarily reducing the target’s </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;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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\" class=\"tooltip-convert\">Difficulty</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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline !important\"> by a value equal to your </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;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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\" class=\"tooltip-convert\">Knowledge</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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline !important\"> (minimum 1).</span></p>",
+      "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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">Conjure a dark glyph upon their body that exposes their weak points, temporarily reducing the target’s </span><span class=\"tooltip-convert\" 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;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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\">Difficulty</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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\"> by a value equal to your </span><span class=\"tooltip-convert\" 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;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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\">Knowledge</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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\"> (minimum 1).</p>",
       "tint": "#ffffff",
       "statuses": [],
-      "showIcon": 1,
-      "folder": null,
       "sort": 0,
       "flags": {},
       "_stats": {
         "compendiumSource": null
       },
-      "_key": "!items.effects!B5HXqYRJiL3xMNKT.9avDhppIdTqAR56f"
+      "_key": "!items.effects!B5HXqYRJiL3xMNKT.st8Ji9ZNexvw64xM"
+    },
+    {
+      "name": "Glyph of Nightfall",
+      "img": "icons/magic/symbols/runes-triangle-magenta.webp",
+      "origin": "Compendium.daggerheart.domains.Item.B5HXqYRJiL3xMNKT",
+      "transfer": false,
+      "_id": "X2w3kRHaETs8YWLO",
+      "type": "base",
+      "system": {
+        "rangeDependence": {
+          "enabled": false,
+          "type": "withinRange",
+          "target": "hostile",
+          "range": "melee"
+        }
+      },
+      "changes": [
+        {
+          "key": "system.difficulty",
+          "mode": 2,
+          "value": "-max(ORIGIN.@system.traits.knowledge.value,1)",
+          "priority": null
+        }
+      ],
+      "disabled": false,
+      "duration": {
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
+      },
+      "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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">Conjure a dark glyph upon their body that exposes their weak points, temporarily reducing the target’s </span><span class=\"tooltip-convert\" 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;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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\">Difficulty</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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\"> by a value equal to your </span><span class=\"tooltip-convert\" 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;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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\">Knowledge</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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\"> (minimum 1).</p>",
+      "tint": "#ffffff",
+      "statuses": [],
+      "sort": 0,
+      "flags": {},
+      "_stats": {
+        "compendiumSource": null
+      },
+      "_key": "!items.effects!B5HXqYRJiL3xMNKT.X2w3kRHaETs8YWLO"
     }
   ],
   "ownership": {
diff --git a/src/packs/domains/domainCard_Hold_the_Line_kdFoLo3KXwn4LqTG.json b/src/packs/domains/domainCard_Hold_the_Line_kdFoLo3KXwn4LqTG.json
index 263220e4..5b3c95d3 100644
--- a/src/packs/domains/domainCard_Hold_the_Line_kdFoLo3KXwn4LqTG.json
+++ b/src/packs/domains/domainCard_Hold_the_Line_kdFoLo3KXwn4LqTG.json
@@ -132,18 +132,18 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [],
-        "duration": {
-          "type": "temporary"
         }
       },
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "<p class=\"Body-Foundation\">If an adversary moves within Very Close range, they’re pulled into Melee range and <em>Restrained.</em></p>",
       "tint": "#ffffff",
@@ -155,16 +155,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!kdFoLo3KXwn4LqTG.WTYg0b8nE1XbnMiA"
     }
   ],
diff --git a/src/packs/domains/domainCard_Hush_gwmYasmfgXZ7tFS6.json b/src/packs/domains/domainCard_Hush_gwmYasmfgXZ7tFS6.json
index 23b9588d..f49c4a83 100644
--- a/src/packs/domains/domainCard_Hush_gwmYasmfgXZ7tFS6.json
+++ b/src/packs/domains/domainCard_Hush_gwmYasmfgXZ7tFS6.json
@@ -82,7 +82,45 @@
   "effects": [
     {
       "name": "Silenced",
-      "img": "systems/daggerheart/assets/icons/domains/domain-card/midnight.png",
+      "img": "icons/svg/sound-off.svg",
+      "origin": "Compendium.daggerheart.domains.Item.gwmYasmfgXZ7tFS6",
+      "transfer": false,
+      "_id": "5hzzPTFccUSSNHgp",
+      "type": "base",
+      "system": {
+        "rangeDependence": {
+          "enabled": false,
+          "type": "withinRange",
+          "target": "hostile",
+          "range": "melee"
+        }
+      },
+      "changes": [],
+      "disabled": false,
+      "duration": {
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
+      },
+      "description": "<p><span style=\"box-sizing:border-box;margin:0px;scrollbar-width:thin;scrollbar-color:rgb(93, 20, 43) rgba(0, 0, 0, 0);color:rgb(239, 230, 216);font-family:Signika, 'Palatino Linotype', 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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\">Auppressive magic around the target that encompasses everything within Very Close range of them and follows them as they move. </span><span class=\"Body-Foundation\" style=\"box-sizing:border-box;margin:0px;scrollbar-width:thin;scrollbar-color:rgb(93, 20, 43) rgba(0, 0, 0, 0);color:rgb(239, 230, 216);font-family:Signika, 'Palatino Linotype', 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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\">The target and anything within the area is <em style=\"box-sizing:border-box;scrollbar-width:thin;scrollbar-color:rgb(93, 20, 43) rgba(0, 0, 0, 0)\">Silenced </em>until the GM spends a Fear on their turn to clear this condition, you cast Hush again, or you take Major damage. While <em style=\"box-sizing:border-box;scrollbar-width:thin;scrollbar-color:rgb(93, 20, 43) rgba(0, 0, 0, 0)\">Silenced</em>, they can’t make noise and can’t cast spells.</p>",
+      "tint": "#ffffff",
+      "statuses": [
+        "silence"
+      ],
+      "sort": 0,
+      "flags": {},
+      "_stats": {
+        "compendiumSource": null
+      },
+      "_key": "!items.effects!gwmYasmfgXZ7tFS6.5hzzPTFccUSSNHgp"
+    },
+    {
+      "name": "Silenced",
+      "img": "icons/svg/sound-off.svg",
       "origin": "Compendium.daggerheart.domains.Item.gwmYasmfgXZ7tFS6",
       "transfer": false,
       "_id": "pZ5YpjKidaj48IYF",
@@ -93,21 +131,20 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [],
-        "duration": {
-          "type": "temporary",
-          "description": "<p>Until the GM spends a Fear on their turn to clear this condition, you cast Hush again, or you take Major damage.</p>"
         }
       },
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
-      "description": "<p>Suppressive magic around the target that encompasses everything within Very Close range of them and follows them as they move. The target and anything within the area is Silenced until the GM spends a Fear on their turn to clear this condition, you cast Hush again, or you take Major damage. While Silenced, they can’t make noise and can’t cast spells.</p>",
+      "description": "<p><span style=\"box-sizing:border-box;margin:0px;scrollbar-width:thin;scrollbar-color:rgb(93, 20, 43) rgba(0, 0, 0, 0);color:rgb(239, 230, 216);font-family:Signika, 'Palatino Linotype', 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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\">Suppressive magic around the target that encompasses everything within Very Close range of them and follows them as they move. </span><span class=\"Body-Foundation\" style=\"box-sizing:border-box;margin:0px;scrollbar-width:thin;scrollbar-color:rgb(93, 20, 43) rgba(0, 0, 0, 0);color:rgb(239, 230, 216);font-family:Signika, 'Palatino Linotype', 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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\">The target and anything within the area is <em style=\"box-sizing:border-box;scrollbar-width:thin;scrollbar-color:rgb(93, 20, 43) rgba(0, 0, 0, 0)\">Silenced </em>until the GM spends a Fear on their turn to clear this condition, you cast Hush again, or you take Major damage. While <em style=\"box-sizing:border-box;scrollbar-width:thin;scrollbar-color:rgb(93, 20, 43) rgba(0, 0, 0, 0)\">Silenced</em>, they can’t make noise and can’t cast spells.</p>",
       "tint": "#ffffff",
       "statuses": [],
       "sort": 0,
@@ -115,16 +152,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!gwmYasmfgXZ7tFS6.pZ5YpjKidaj48IYF"
     }
   ],
diff --git a/src/packs/domains/domainCard_Hypnotic_Shimmer_2ZeuCGVatQdPOVC6.json b/src/packs/domains/domainCard_Hypnotic_Shimmer_2ZeuCGVatQdPOVC6.json
index ffa0226d..67310781 100644
--- a/src/packs/domains/domainCard_Hypnotic_Shimmer_2ZeuCGVatQdPOVC6.json
+++ b/src/packs/domains/domainCard_Hypnotic_Shimmer_2ZeuCGVatQdPOVC6.json
@@ -112,20 +112,20 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [],
-        "duration": {
-          "type": "temporary"
         }
       },
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
-      "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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">An illusion of flashing colors and lights that temporarily </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-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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\">Stuns</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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\"> targets. While </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-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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\">Stunned</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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">, they can’t use reactions and can’t take any other actions until they clear this </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;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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\" class=\"tooltip-convert\">condition</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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">.</span></p>",
+      "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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">An illusion of flashing colors and lights that temporarily </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-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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\">Stuns</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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\"> targets. While </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-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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\">Stunned</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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">, they can’t use reactions and can’t take any other actions until they clear this </span><span class=\"tooltip-convert\" 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;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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\">condition</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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">.</p>",
       "tint": "#ffffff",
       "statuses": [
         "stun"
@@ -135,16 +135,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!2ZeuCGVatQdPOVC6.xAG75UWUz3aDZH3m"
     }
   ],
diff --git a/src/packs/domains/domainCard_Life_Ward_OszbCj0jTqq2ADx9.json b/src/packs/domains/domainCard_Life_Ward_OszbCj0jTqq2ADx9.json
index de841ffe..19a6fda6 100644
--- a/src/packs/domains/domainCard_Life_Ward_OszbCj0jTqq2ADx9.json
+++ b/src/packs/domains/domainCard_Life_Ward_OszbCj0jTqq2ADx9.json
@@ -70,18 +70,18 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [],
-        "duration": {
-          "type": "longRest"
         }
       },
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "<p>Marked with a glowing sigil of protection. When this ally would make a death move, they clear a Hit Point instead.</p><p class=\"Body-Foundation\">This effect ends when it saves the target from a death move, you cast Life Ward on another target, or you take a long rest.</p>",
       "tint": "#ffffff",
@@ -91,16 +91,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!OszbCj0jTqq2ADx9.E7Ou4OMEy3TeK1Gf"
     }
   ],
diff --git a/src/packs/domains/domainCard_Mass_Enrapture_ubpixIgZrJXKyM3b.json b/src/packs/domains/domainCard_Mass_Enrapture_ubpixIgZrJXKyM3b.json
index d4df379e..da64f16e 100644
--- a/src/packs/domains/domainCard_Mass_Enrapture_ubpixIgZrJXKyM3b.json
+++ b/src/packs/domains/domainCard_Mass_Enrapture_ubpixIgZrJXKyM3b.json
@@ -144,20 +144,20 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [],
-        "duration": {
-          "type": "temporary"
         }
       },
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
-      "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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">While </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-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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\">Enraptured</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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">, a target’s attention is fixed on you, narrowing their field of view and drowning out any sound but your voice.</span></p>",
+      "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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">While </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-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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\">Enraptured</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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">, a target’s attention is fixed on you, narrowing their field of view and drowning out any sound but your voice.</p>",
       "tint": "#ffffff",
       "statuses": [],
       "sort": 0,
@@ -165,16 +165,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!ubpixIgZrJXKyM3b.QNbnelRylVB0yCm0"
     }
   ],
diff --git a/src/packs/domains/domainCard_Night_Terror_zcldCuqOg3dphUVI.json b/src/packs/domains/domainCard_Night_Terror_zcldCuqOg3dphUVI.json
index 59a0c924..6ffddbe7 100644
--- a/src/packs/domains/domainCard_Night_Terror_zcldCuqOg3dphUVI.json
+++ b/src/packs/domains/domainCard_Night_Terror_zcldCuqOg3dphUVI.json
@@ -146,20 +146,20 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [],
-        "duration": {
-          "type": "temporary"
         }
       },
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
-      "description": "<p>While Horrified, they’re Vulnerable.</p>",
+      "description": "<p><span style=\"color:rgb(239, 230, 216);font-family:Signika, 'Palatino Linotype', 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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">While </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:Signika, 'Palatino Linotype', sans-serif;font-size:14px;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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\">Horrified</span><span style=\"color:rgb(239, 230, 216);font-family:Signika, 'Palatino Linotype', 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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">, they’re </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:Signika, 'Palatino Linotype', sans-serif;font-size:14px;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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\">Vulnerable</span><span style=\"color:rgb(239, 230, 216);font-family:Signika, 'Palatino Linotype', 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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">.</p>",
       "tint": "#ffffff",
       "statuses": [
         "vulnerable"
@@ -169,16 +169,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!zcldCuqOg3dphUVI.32j3ZeNMMCk1QLlM"
     }
   ],
diff --git a/src/packs/domains/domainCard_Overwhelming_Aura_iEBLySZD9z8CLdz7.json b/src/packs/domains/domainCard_Overwhelming_Aura_iEBLySZD9z8CLdz7.json
index 1b0173d7..cc04c9c9 100644
--- a/src/packs/domains/domainCard_Overwhelming_Aura_iEBLySZD9z8CLdz7.json
+++ b/src/packs/domains/domainCard_Overwhelming_Aura_iEBLySZD9z8CLdz7.json
@@ -94,25 +94,25 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [
-          {
-            "key": "system.traits.presence.value",
-            "value": "@cast",
-            "priority": 51,
-            "type": "override"
-          }
-        ],
-        "duration": {
-          "type": "longRest"
         }
       },
+      "changes": [
+        {
+          "key": "system.traits.presence.value",
+          "mode": 5,
+          "value": "@cast",
+          "priority": 51
+        }
+      ],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "<p>Your Presence is equal to your Spellcast trait until your next long rest.<br />While this spell is active, an adversary must mark a Stress when they target you with an attack.</p>",
       "tint": "#ffffff",
@@ -122,16 +122,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!iEBLySZD9z8CLdz7.ba9GO4NtQHYkaRR9"
     }
   ],
diff --git a/src/packs/domains/domainCard_Redirect_faU0XkJCbar69PiN.json b/src/packs/domains/domainCard_Redirect_faU0XkJCbar69PiN.json
index aeb20f1d..4adb8240 100644
--- a/src/packs/domains/domainCard_Redirect_faU0XkJCbar69PiN.json
+++ b/src/packs/domains/domainCard_Redirect_faU0XkJCbar69PiN.json
@@ -50,7 +50,7 @@
   },
   "flags": {},
   "_id": "faU0XkJCbar69PiN",
-  "sort": 3500000,
+  "sort": 3400000,
   "effects": [],
   "ownership": {
     "default": 0
diff --git a/src/packs/domains/domainCard_Shadowbind_kguhWlidhxe2GbT0.json b/src/packs/domains/domainCard_Shadowbind_kguhWlidhxe2GbT0.json
index 39139dfa..cd906eaa 100644
--- a/src/packs/domains/domainCard_Shadowbind_kguhWlidhxe2GbT0.json
+++ b/src/packs/domains/domainCard_Shadowbind_kguhWlidhxe2GbT0.json
@@ -85,18 +85,18 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [],
-        "duration": {
-          "type": "temporary"
         }
       },
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "",
       "tint": "#ffffff",
@@ -108,16 +108,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!kguhWlidhxe2GbT0.RFB4V0V4bDJ6vCL2"
     }
   ],
diff --git a/src/packs/domains/domainCard_Stunning_Sunlight_lRHo6ZkK1zybeEoG.json b/src/packs/domains/domainCard_Stunning_Sunlight_lRHo6ZkK1zybeEoG.json
index f9b86bd0..6fde5d18 100644
--- a/src/packs/domains/domainCard_Stunning_Sunlight_lRHo6ZkK1zybeEoG.json
+++ b/src/packs/domains/domainCard_Stunning_Sunlight_lRHo6ZkK1zybeEoG.json
@@ -175,20 +175,20 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [],
-        "duration": {
-          "type": "temporary"
         }
       },
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
-      "description": "<p>Temporarily Stunned. While Stunned, they can’t use reactions and can’t take any other actions until they clear this condition.</p>",
+      "description": "<p>Temporarily Stunned. <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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">While </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-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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\">Stunned</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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">, they can’t use reactions and can’t take any other actions until they clear this </span><span class=\"tooltip-convert\" 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;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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\">condition</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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">.</p>",
       "tint": "#ffffff",
       "statuses": [
         "stun"
@@ -198,16 +198,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!lRHo6ZkK1zybeEoG.kSLuGSI6FLhOJaGp"
     }
   ],
diff --git a/src/packs/domains/domainCard_Tempest_X7YaZgFieBlqaPdZ.json b/src/packs/domains/domainCard_Tempest_X7YaZgFieBlqaPdZ.json
index 7d587b02..d82dd9fa 100644
--- a/src/packs/domains/domainCard_Tempest_X7YaZgFieBlqaPdZ.json
+++ b/src/packs/domains/domainCard_Tempest_X7YaZgFieBlqaPdZ.json
@@ -268,18 +268,18 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [],
-        "duration": {
-          "type": "temporary"
         }
       },
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "",
       "tint": "#ffffff",
@@ -291,16 +291,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!X7YaZgFieBlqaPdZ.oqPY3I9oO9J6l5Aj"
     },
     {
diff --git a/src/packs/domains/domainCard_Through_Your_Eyes_7b0mzV5QMPjVPT4o.json b/src/packs/domains/domainCard_Through_Your_Eyes_7b0mzV5QMPjVPT4o.json
index 529950b5..ed01392d 100644
--- a/src/packs/domains/domainCard_Through_Your_Eyes_7b0mzV5QMPjVPT4o.json
+++ b/src/packs/domains/domainCard_Through_Your_Eyes_7b0mzV5QMPjVPT4o.json
@@ -61,20 +61,20 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [],
-        "duration": {
-          "type": "shortRest"
         }
       },
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
-      "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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">Can see through their eyes and hear through their ears.</span></p>",
+      "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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">Can see through their eyes and hear through their ears.</p>",
       "tint": "#ffffff",
       "statuses": [],
       "sort": 0,
@@ -82,16 +82,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!7b0mzV5QMPjVPT4o.TCOHV7tWpunCZDxn"
     }
   ],
diff --git a/src/packs/domains/domainCard_Transcendent_Union_kVkoCLBXLAIifqpz.json b/src/packs/domains/domainCard_Transcendent_Union_kVkoCLBXLAIifqpz.json
index 4460a5db..7d8d9bbe 100644
--- a/src/packs/domains/domainCard_Transcendent_Union_kVkoCLBXLAIifqpz.json
+++ b/src/packs/domains/domainCard_Transcendent_Union_kVkoCLBXLAIifqpz.json
@@ -70,18 +70,18 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [],
-        "duration": {
-          "type": "shortRest"
         }
       },
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "<p class=\"Body-Foundation\">Until your next rest, when a creature connected by this union would mark Stress or Hit Points, the connected creatures can choose who marks it.</p><p></p>",
       "tint": "#ffffff",
@@ -91,16 +91,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!kVkoCLBXLAIifqpz.kMcvp2QKmBP4uinB"
     }
   ],
diff --git a/src/packs/domains/domainCard_Vicious_Entangle_qvpvTnkAoRn9vYO4.json b/src/packs/domains/domainCard_Vicious_Entangle_qvpvTnkAoRn9vYO4.json
index 85935876..dae448e9 100644
--- a/src/packs/domains/domainCard_Vicious_Entangle_qvpvTnkAoRn9vYO4.json
+++ b/src/packs/domains/domainCard_Vicious_Entangle_qvpvTnkAoRn9vYO4.json
@@ -146,18 +146,18 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [],
-        "duration": {
-          "type": "temporary"
         }
       },
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "",
       "tint": "#ffffff",
@@ -169,16 +169,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!qvpvTnkAoRn9vYO4.Xh0wrgRUuYpwChBU"
     },
     {
@@ -194,18 +184,18 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [],
-        "duration": {
-          "type": "temporary"
         }
       },
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "",
       "tint": "#ffffff",
@@ -217,16 +207,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!qvpvTnkAoRn9vYO4.2xzOqTaPJQzGqFJv"
     }
   ],
diff --git a/src/packs/environments/environment_Abandoned_Grove_pGEdzdLkqYtBhxnG.json b/src/packs/environments/environment_Abandoned_Grove_pGEdzdLkqYtBhxnG.json
index 0fa0a09e..c1006da4 100644
--- a/src/packs/environments/environment_Abandoned_Grove_pGEdzdLkqYtBhxnG.json
+++ b/src/packs/environments/environment_Abandoned_Grove_pGEdzdLkqYtBhxnG.json
@@ -268,19 +268,18 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary",
-              "description": "<p>Until you’re freed with a successful Finesse or Strength roll or by dealing at least 6 damage to the vines.</p>"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "<p><em>Restrained</em> lasts until you’re freed with a successful Finesse or Strength roll or by dealing at least 6 damage to the vines.</p>",
           "tint": "#ffffff",
@@ -292,16 +291,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!pGEdzdLkqYtBhxnG.maK5OyfrOxcjCoPt.LSeftEwgBbXXkLw3"
         }
       ],
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 a48d9b83..ea4f1951 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
@@ -271,41 +271,30 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary",
-              "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;\">Until you break free with a successful Finesse or Strength Roll or by dealing 10 damage to the vines.</span></p>"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
-          "description": "<p><em>Restrained</em> and <em>Vulnerable</em> until you break free, clearing both conditions, with a successful Finesse or Strength Roll or by dealing 10 damage to the vines. When the target makes a roll to escape, they take <strong>1d8+4</strong> physical damage and lose a Hope.</p><section id=\"secret-Eui1zx8GKoUhEXq6\" class=\"secret\"><p><em>What painful memories do the vines bring to the surface as they pierce flesh?</em></p></section>",
+          "description": "<p><em>Restrained</em> and <em>Vulnerable</em> until you break free, clearing both conditions, with a successful Finesse or Strength Roll or by dealing 10 damage to the vines. When the target makes a roll to escape, they take <strong>1d8+4</strong> physical damage and lose a Hope.</p><section class=\"secret\" id=\"secret-Eui1zx8GKoUhEXq6\"><p><em>What painful memories do the vines bring to the surface as they pierce flesh?</em></p></section>",
           "tint": "#ffffff",
           "statuses": [
-            "vulnerable",
-            "restrained"
+            "restrained",
+            "vulnerable"
           ],
           "sort": 0,
           "flags": {},
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!oY69NN4rYxoRE4hl.1aOeMMX0XuDtZbbB.gCkqvBUljsOsYacB"
         }
       ],
diff --git a/src/packs/environments/environment_Bustling_Marketplace_HZKA7hkej7JJY503.json b/src/packs/environments/environment_Bustling_Marketplace_HZKA7hkej7JJY503.json
index af0b3a70..ad96108b 100644
--- a/src/packs/environments/environment_Bustling_Marketplace_HZKA7hkej7JJY503.json
+++ b/src/packs/environments/environment_Bustling_Marketplace_HZKA7hkej7JJY503.json
@@ -50,9 +50,12 @@
       "src": "systems/daggerheart/assets/icons/documents/actors/forest.svg",
       "anchorX": 0.5,
       "anchorY": 0.5,
+      "offsetX": 0,
+      "offsetY": 0,
       "fit": "contain",
       "scaleX": 1,
       "scaleY": 1,
+      "rotation": 0,
       "tint": "#ffffff",
       "alphaThreshold": 0.75
     },
@@ -103,7 +106,7 @@
       "saturation": 0,
       "contrast": 0
     },
-    "detectionModes": {},
+    "detectionModes": [],
     "occludable": {
       "radius": 0
     },
@@ -129,15 +132,14 @@
     "flags": {},
     "randomImg": false,
     "appendNumber": false,
-    "prependAdjective": false,
-    "depth": 1
+    "prependAdjective": false
   },
   "items": [
     {
       "name": "Tip the Scales",
       "type": "feature",
       "system": {
-        "description": "<p>PCs can gain advantage on a Presence Roll by offering a handful of gold as part of the interaction.</p><section id=\"secret-SkvXxhBWKBtYdJaq\" class=\"secret\"><p><em>Will any coin be accepted or only local currency? How overt are the PCs in offering this bribe?</em></p></section>",
+        "description": "<p>PCs can gain advantage on a Presence Roll by off ering a handful of gold as part of the interaction. </p><section id=\"secret-SkvXxhBWKBtYdJaq\" class=\"secret\"><p><em>Will any coin be accepted or only local currency? How overt are the PCs in offering this bribe?</em></p></section>",
         "resource": null,
         "actions": {},
         "originItemType": null,
diff --git a/src/packs/environments/environment_Raging_River_t4cdqTfzcqP3H1vJ.json b/src/packs/environments/environment_Raging_River_t4cdqTfzcqP3H1vJ.json
index 03dd72e3..6c34c296 100644
--- a/src/packs/environments/environment_Raging_River_t4cdqTfzcqP3H1vJ.json
+++ b/src/packs/environments/environment_Raging_River_t4cdqTfzcqP3H1vJ.json
@@ -315,19 +315,18 @@
               "type": "withinRange",
               "target": "hostile",
               "range": "melee"
-            },
-            "changes": [],
-            "duration": {
-              "type": "temporary",
-              "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;\">Until you get out of the river.</span></p>"
             }
           },
+          "changes": [],
           "disabled": false,
           "duration": {
-            "value": null,
-            "units": "seconds",
-            "expiry": null,
-            "expired": false
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
           },
           "description": "<p><em>Vulnerable</em> until you get out of the river.</p>",
           "tint": "#ffffff",
@@ -339,16 +338,6 @@
           "_stats": {
             "compendiumSource": null
           },
-          "start": {
-            "time": 0,
-            "combat": null,
-            "combatant": null,
-            "initiative": null,
-            "round": null,
-            "turn": null
-          },
-          "showIcon": 1,
-          "folder": null,
           "_key": "!actors.items.effects!t4cdqTfzcqP3H1vJ.WsNoSwwtv0r80BMj.T0ouSQyR8cVpAn79"
         }
       ],
diff --git a/src/packs/items/consumables/consumable_Blinding_Orb_eAXHdzA5qNPldOpn.json b/src/packs/items/consumables/consumable_Blinding_Orb_eAXHdzA5qNPldOpn.json
index 9c6403e1..94a6671b 100644
--- a/src/packs/items/consumables/consumable_Blinding_Orb_eAXHdzA5qNPldOpn.json
+++ b/src/packs/items/consumables/consumable_Blinding_Orb_eAXHdzA5qNPldOpn.json
@@ -60,21 +60,19 @@
       "transfer": false,
       "_id": "nryJhrF26hyFQUxH",
       "type": "base",
-      "system": {
-        "changes": [],
-        "duration": {
-          "type": "temporary",
-          "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;\">Until they mark HP.</span></p>"
-        }
-      },
+      "system": {},
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
-      "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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">You are Vulnerable until you mark a Hit Point.</span></p>",
+      "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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">You are Vulnerable until you mark a Hit Point.</p>",
       "tint": "#ffffff",
       "statuses": [
         "vulnerable"
@@ -84,16 +82,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!eAXHdzA5qNPldOpn.nryJhrF26hyFQUxH"
     }
   ],
diff --git a/src/packs/items/consumables/consumable_Growing_Potion_fl2f3ees8RFMze9t.json b/src/packs/items/consumables/consumable_Growing_Potion_fl2f3ees8RFMze9t.json
index 44114455..e4493348 100644
--- a/src/packs/items/consumables/consumable_Growing_Potion_fl2f3ees8RFMze9t.json
+++ b/src/packs/items/consumables/consumable_Growing_Potion_fl2f3ees8RFMze9t.json
@@ -60,31 +60,30 @@
       "transfer": false,
       "_id": "YEGd74Lssj7rCmpF",
       "type": "base",
-      "system": {
-        "changes": [
-          {
-            "key": "system.traits.strength.value",
-            "value": 2,
-            "priority": null,
-            "type": "add"
-          },
-          {
-            "key": "system.proficiency",
-            "value": 1,
-            "priority": null,
-            "type": "add"
-          }
-        ],
-        "duration": {
-          "type": "shortRest"
+      "system": {},
+      "changes": [
+        {
+          "key": "system.traits.strength.value",
+          "mode": 2,
+          "value": "2",
+          "priority": null
+        },
+        {
+          "key": "system.proficiency",
+          "mode": 2,
+          "value": "1",
+          "priority": null
         }
-      },
+      ],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "",
       "tint": "#ffffff",
@@ -94,16 +93,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!fl2f3ees8RFMze9t.YEGd74Lssj7rCmpF"
     }
   ],
diff --git a/src/packs/items/consumables/consumable_Major_Stride_Potion_yK6eEDUrsPbZA8G0.json b/src/packs/items/consumables/consumable_Major_Stride_Potion_yK6eEDUrsPbZA8G0.json
index cfcee96b..320a77a3 100644
--- a/src/packs/items/consumables/consumable_Major_Stride_Potion_yK6eEDUrsPbZA8G0.json
+++ b/src/packs/items/consumables/consumable_Major_Stride_Potion_yK6eEDUrsPbZA8G0.json
@@ -60,25 +60,24 @@
       "transfer": false,
       "_id": "L9dAw8pws1o02XkE",
       "type": "base",
-      "system": {
-        "changes": [
-          {
-            "key": "system.traits.agility.value",
-            "value": 1,
-            "priority": null,
-            "type": "add"
-          }
-        ],
-        "duration": {
-          "type": "shortRest"
+      "system": {},
+      "changes": [
+        {
+          "key": "system.traits.agility.value",
+          "mode": 2,
+          "value": "1",
+          "priority": null
         }
-      },
+      ],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "",
       "tint": "#ffffff",
@@ -88,16 +87,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!yK6eEDUrsPbZA8G0.L9dAw8pws1o02XkE"
     }
   ],
diff --git a/src/packs/items/consumables/consumable_Morphing_Clay_f1NHVSIHJJCIOaBl.json b/src/packs/items/consumables/consumable_Morphing_Clay_f1NHVSIHJJCIOaBl.json
index 68965de6..970cabd4 100644
--- a/src/packs/items/consumables/consumable_Morphing_Clay_f1NHVSIHJJCIOaBl.json
+++ b/src/packs/items/consumables/consumable_Morphing_Clay_f1NHVSIHJJCIOaBl.json
@@ -66,20 +66,20 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [],
-        "duration": {
-          "type": "shortRest"
         }
       },
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
-      "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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">Your face is unrecognizable until your next rest.</span></p>",
+      "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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">Your face is unrecognizable until your next rest.</p>",
       "tint": "#ffffff",
       "statuses": [],
       "sort": 0,
@@ -87,16 +87,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!f1NHVSIHJJCIOaBl.rMno0zO5Cbwlu4zn"
     }
   ],
diff --git a/src/packs/items/consumables/consumable_Ogre_Musk_qr1bosjFcUfuwq4B.json b/src/packs/items/consumables/consumable_Ogre_Musk_qr1bosjFcUfuwq4B.json
index fdd98249..874072cc 100644
--- a/src/packs/items/consumables/consumable_Ogre_Musk_qr1bosjFcUfuwq4B.json
+++ b/src/packs/items/consumables/consumable_Ogre_Musk_qr1bosjFcUfuwq4B.json
@@ -66,20 +66,20 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [],
-        "duration": {
-          "type": "shortRest"
         }
       },
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
-      "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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">You cannot be tracked by mundane or magical means until your next rest.</span></p>",
+      "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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">You cannot be tracked by mundane or magical means until your next rest.</p>",
       "tint": "#ffffff",
       "statuses": [],
       "sort": 0,
@@ -87,16 +87,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!qr1bosjFcUfuwq4B.n73d0J4oMCBIPWHN"
     }
   ],
diff --git a/src/packs/items/consumables/consumable_Shrinking_Potion_HGixKenQwhyRAYNk.json b/src/packs/items/consumables/consumable_Shrinking_Potion_HGixKenQwhyRAYNk.json
index ed0e233e..7bf8c686 100644
--- a/src/packs/items/consumables/consumable_Shrinking_Potion_HGixKenQwhyRAYNk.json
+++ b/src/packs/items/consumables/consumable_Shrinking_Potion_HGixKenQwhyRAYNk.json
@@ -60,31 +60,30 @@
       "transfer": false,
       "_id": "yaRLd7eHWYm2MHRM",
       "type": "base",
-      "system": {
-        "changes": [
-          {
-            "key": "system.traits.agility.value",
-            "value": 2,
-            "priority": null,
-            "type": "add"
-          },
-          {
-            "key": "system.proficiency",
-            "value": -1,
-            "priority": null,
-            "type": "add"
-          }
-        ],
-        "duration": {
-          "type": "shortRest"
+      "system": {},
+      "changes": [
+        {
+          "key": "system.traits.agility.value",
+          "mode": 2,
+          "value": "2",
+          "priority": null
+        },
+        {
+          "key": "system.proficiency",
+          "mode": 2,
+          "value": "-1",
+          "priority": null
         }
-      },
+      ],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "",
       "tint": "#ffffff",
@@ -94,16 +93,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!HGixKenQwhyRAYNk.yaRLd7eHWYm2MHRM"
     }
   ],
diff --git a/src/packs/items/consumables/consumable_Vial_of_Moondrip_VqEX5YwK5oL3r1t6.json b/src/packs/items/consumables/consumable_Vial_of_Moondrip_VqEX5YwK5oL3r1t6.json
index 195a46de..42359fe8 100644
--- a/src/packs/items/consumables/consumable_Vial_of_Moondrip_VqEX5YwK5oL3r1t6.json
+++ b/src/packs/items/consumables/consumable_Vial_of_Moondrip_VqEX5YwK5oL3r1t6.json
@@ -66,20 +66,20 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [],
-        "duration": {
-          "type": "shortRest"
         }
       },
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
-      "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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">You can see in total darkness until your next rest.</span></p>",
+      "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.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">You can see in total darkness until your next rest.</p>",
       "tint": "#ffffff",
       "statuses": [],
       "sort": 0,
@@ -87,16 +87,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!VqEX5YwK5oL3r1t6.548KAUPcSbQLsivh"
     }
   ],
diff --git a/src/packs/subclasses/feature_Act_of_Reprisal_k7vvMJtEcxMWUUrW.json b/src/packs/subclasses/feature_Act_of_Reprisal_k7vvMJtEcxMWUUrW.json
index 5dee0c1c..304bd29c 100644
--- a/src/packs/subclasses/feature_Act_of_Reprisal_k7vvMJtEcxMWUUrW.json
+++ b/src/packs/subclasses/feature_Act_of_Reprisal_k7vvMJtEcxMWUUrW.json
@@ -59,19 +59,13 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [],
-        "duration": {
-          "type": "temporary",
-          "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;\">Until the next successful attack you make against that adversary.</span></p>"
         }
       },
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null
       },
       "description": "",
       "tint": "#ffffff",
@@ -81,16 +75,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!k7vvMJtEcxMWUUrW.9Uo0yOYGn3vandPp"
     }
   ],
diff --git a/src/packs/subclasses/feature_Battle_Bonded_hWsKyed1vfILg0I8.json b/src/packs/subclasses/feature_Battle_Bonded_hWsKyed1vfILg0I8.json
index 578be0a3..106b0057 100644
--- a/src/packs/subclasses/feature_Battle_Bonded_hWsKyed1vfILg0I8.json
+++ b/src/packs/subclasses/feature_Battle_Bonded_hWsKyed1vfILg0I8.json
@@ -26,28 +26,27 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [
-          {
-            "key": "system.evasion",
-            "value": 2,
-            "priority": null,
-            "type": "add"
-          }
-        ],
-        "duration": {
-          "type": "",
-          "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;\">Against the attack.</span></p>"
         }
       },
       "_id": "IZhakv6EuG8DO4a3",
       "img": "icons/creatures/mammals/humanoid-wolf-dog-blue.webp",
+      "changes": [
+        {
+          "key": "system.evasion",
+          "mode": 2,
+          "value": "2",
+          "priority": null
+        }
+      ],
       "disabled": true,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "<p>When an adversary attacks you while they’re within your companion’s Melee range, you gain a +2 bonus to your Evasion against the attack.</p>",
       "origin": null,
@@ -59,16 +58,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!hWsKyed1vfILg0I8.IZhakv6EuG8DO4a3"
     }
   ],
diff --git a/src/packs/subclasses/feature_Elemental_Dominion_EFUJHrkTuyv8uA9l.json b/src/packs/subclasses/feature_Elemental_Dominion_EFUJHrkTuyv8uA9l.json
index 2476046c..4297173f 100644
--- a/src/packs/subclasses/feature_Elemental_Dominion_EFUJHrkTuyv8uA9l.json
+++ b/src/packs/subclasses/feature_Elemental_Dominion_EFUJHrkTuyv8uA9l.json
@@ -189,18 +189,18 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "veryFar"
-        },
-        "changes": [],
-        "duration": {
-          "type": "temporary"
         }
       },
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "<p>When an attack against you succeeds, you can mark a Stress to make the attacker temporarily Vulnerable.</p>",
       "tint": "#ffffff",
@@ -212,16 +212,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!EFUJHrkTuyv8uA9l.bGwFZZT4juuaIRmZ"
     },
     {
diff --git a/src/packs/subclasses/feature_Elusive_Predator_Cjtc43V3IzAmfIFG.json b/src/packs/subclasses/feature_Elusive_Predator_Cjtc43V3IzAmfIFG.json
index 82cd55a0..18f80cdb 100644
--- a/src/packs/subclasses/feature_Elusive_Predator_Cjtc43V3IzAmfIFG.json
+++ b/src/packs/subclasses/feature_Elusive_Predator_Cjtc43V3IzAmfIFG.json
@@ -26,28 +26,27 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [
-          {
-            "key": "system.evasion",
-            "value": 2,
-            "priority": null,
-            "type": "add"
-          }
-        ],
-        "duration": {
-          "type": "",
-          "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;\">Against the attack.</span></p>"
         }
       },
       "_id": "X4llFOcAcdJLbear",
       "img": "icons/creatures/mammals/beast-horned-scaled-glowing-orange.webp",
+      "changes": [
+        {
+          "key": "system.evasion",
+          "mode": 2,
+          "value": "2",
+          "priority": null
+        }
+      ],
       "disabled": true,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "<p>When your Focus makes an attack against you, you gain a +2 bonus to your Evasion against the attack.</p>",
       "origin": null,
@@ -59,16 +58,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!Cjtc43V3IzAmfIFG.X4llFOcAcdJLbear"
     }
   ],
diff --git a/src/packs/subclasses/feature_Gifted_Performer_99U7YWNCxFZHCiT0.json b/src/packs/subclasses/feature_Gifted_Performer_99U7YWNCxFZHCiT0.json
index 33d5af92..f53f7c31 100644
--- a/src/packs/subclasses/feature_Gifted_Performer_99U7YWNCxFZHCiT0.json
+++ b/src/packs/subclasses/feature_Gifted_Performer_99U7YWNCxFZHCiT0.json
@@ -180,7 +180,7 @@
   "effects": [
     {
       "name": "Epic Song",
-      "img": "icons/tools/instruments/harp-yellow-teal.webp",
+      "img": "icons/svg/ice-aura.svg",
       "origin": "Compendium.daggerheart.subclasses.Item.6j1RP4fz3BwSfoli",
       "transfer": false,
       "_id": "FK4IdbxluRErfYor",
@@ -191,18 +191,18 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "close"
-        },
-        "changes": [],
-        "duration": {
-          "type": "temporary"
         }
       },
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "<p>Make a target within Close range temporarily Vulnerable.</p>",
       "tint": "#ffffff",
@@ -214,16 +214,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!99U7YWNCxFZHCiT0.FK4IdbxluRErfYor"
     }
   ],
diff --git a/src/packs/subclasses/feature_Transcendence_th6HZwEFnVBjUtqm.json b/src/packs/subclasses/feature_Transcendence_th6HZwEFnVBjUtqm.json
index c03c10b5..5f2df7cb 100644
--- a/src/packs/subclasses/feature_Transcendence_th6HZwEFnVBjUtqm.json
+++ b/src/packs/subclasses/feature_Transcendence_th6HZwEFnVBjUtqm.json
@@ -58,29 +58,29 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": [
-          {
-            "key": "system.damageThresholds.severe",
-            "value": "+4",
-            "priority": null,
-            "type": "add"
-          }
-        ],
-        "duration": {
-          "type": ""
         }
       },
       "_id": "zFOpzO3tBJPcZcRc",
       "img": "icons/magic/fire/elemental-fire-flying.webp",
+      "changes": [
+        {
+          "key": "system.damageThresholds.severe",
+          "mode": 2,
+          "value": "+4",
+          "priority": null
+        }
+      ],
       "disabled": true,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
-      "description": "<p>+4 bonus to your Severe threshold</p>",
+      "description": "<p><span style=\"box-sizing:border-box;margin:0px;scrollbar-width:thin;scrollbar-color:rgb(93, 20, 43) rgba(0, 0, 0, 0);font-family:Montserrat, sans-serif\">+4 bonus to your Severe threshold</p>",
       "origin": null,
       "tint": "#ffffff",
       "transfer": true,
@@ -90,16 +90,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": {
-        "time": 0,
-        "combat": null,
-        "combatant": null,
-        "initiative": null,
-        "round": null,
-        "turn": null
-      },
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!th6HZwEFnVBjUtqm.zFOpzO3tBJPcZcRc"
     },
     {
diff --git a/styles/less/sheets/activeEffects/activeEffects.less b/styles/less/sheets/activeEffects/activeEffects.less
index ba3ff43f..f1879463 100644
--- a/styles/less/sheets/activeEffects/activeEffects.less
+++ b/styles/less/sheets/activeEffects/activeEffects.less
@@ -1,28 +1,4 @@
 .application.sheet.daggerheart.dh-style.active-effect-config {
-    .custom-duration-section {
-        width: 100%;
-        display: flex;
-        flex-direction: column;
-        gap: 10px;
-        overflow: hidden;
-        height: 0;
-        transition: height ease-in-out 0.3s;
-
-        &.visible {
-            height: auto;
-        }
-    }
-
-    .duration-description {
-        height: 0;
-        overflow: hidden;
-        transition: height ease-in-out 0.3s;
-
-        &.visible {
-            height: 100px;
-        }
-    }
-
     .tab.changes {
         gap: 0;
 
diff --git a/styles/less/ux/tooltip/bordered-tooltip.less b/styles/less/ux/tooltip/bordered-tooltip.less
index b3a5ed29..78622377 100644
--- a/styles/less/ux/tooltip/bordered-tooltip.less
+++ b/styles/less/ux/tooltip/bordered-tooltip.less
@@ -42,37 +42,5 @@
             color: @golden;
             font-size: 12px;
         }
-
-        .duration-container {
-            display: flex;
-            flex-direction: column;
-            text-align: center;
-            margin-top: 0.5rem;
-            width: 100%;
-
-            &::before,
-            &::after {
-                content: '';
-                background: var(--golden, #f3c267);
-                mask-image: linear-gradient(270deg, transparent 0%, black 50%, transparent 100%);
-                height: 2px;
-                width: calc(100% - 10px);
-            }
-
-            &::before {
-                margin-bottom: 8px;
-            }
-
-            &::after {
-                margin-top: 8px;
-            }
-
-            .duration-inner-container {
-                display: flex;
-                justify-content: center;
-                gap: 2px;
-                width: 100%;
-            }
-        }
     }
 }
diff --git a/styles/less/ux/tooltip/tooltip.less b/styles/less/ux/tooltip/tooltip.less
index ac09afc0..8e6f638d 100644
--- a/styles/less/ux/tooltip/tooltip.less
+++ b/styles/less/ux/tooltip/tooltip.less
@@ -53,33 +53,6 @@ aside[role='tooltip']:has(div.daggerheart.dh-style.tooltip.card-style) {
         }
     }
 
-    .tooltip-duration {
-        font-style: italic;
-        text-align: start;
-        position: relative;
-        width: 100%;
-        padding: 5px 10px;
-        margin: 5px 0px;
-
-        &::before {
-            content: '';
-            background: @golden;
-            mask-image: linear-gradient(270deg, transparent 0%, black 50%, transparent 100%);
-            height: 2px;
-            width: calc(100% - 10px);
-            position: absolute;
-            top: -5px;
-            font-size: 14px;
-        }
-
-        .duration-inner-container {
-            display: flex;
-            justify-content: center;
-            gap: 2px;
-            width: 100%;
-        }
-    }
-
     .tooltip-tags {
         display: flex;
         flex-direction: column;
diff --git a/templates/settings/automation-settings/general.hbs b/templates/settings/automation-settings/general.hbs
index a10e50c6..c5f4d871 100644
--- a/templates/settings/automation-settings/general.hbs
+++ b/templates/settings/automation-settings/general.hbs
@@ -14,7 +14,6 @@
         {{formGroup settingFields.schema.fields.summaryMessages.fields.effects value=settingFields._source.summaryMessages.effects localize=true}}
     </div>
     
-    {{formGroup settingFields.schema.fields.autoExpireActiveEffects value=settingFields._source.autoExpireActiveEffects localize=true}}
     {{formGroup settingFields.schema.fields.countdownAutomation value=settingFields._source.countdownAutomation localize=true}}
     {{formGroup settingFields.schema.fields.actionPoints value=settingFields._source.actionPoints localize=true}}
     {{formGroup settingFields.schema.fields.hordeDamage value=settingFields._source.hordeDamage localize=true}}
diff --git a/templates/sheets/activeEffect/settings.hbs b/templates/sheets/activeEffect/settings.hbs
index 9443edfb..6ccd9ee9 100644
--- a/templates/sheets/activeEffect/settings.hbs
+++ b/templates/sheets/activeEffect/settings.hbs
@@ -7,31 +7,47 @@
         {{formGroup systemFields.rangeDependence.fields.target value=source.system.rangeDependence.target localize=true }}
         {{formGroup systemFields.rangeDependence.fields.range value=source.system.rangeDependence.range localize=true }}
     </fieldset>
-    <fieldset class="one-column">
-        <legend>{{localize "EFFECT.DURATION.Label"}}</legend>
-
-        {{formGroup systemFields.duration.fields.type value=source.system.duration.type localize=true }}
-
-            <div class="form-group slim duration-description">
+{{!-- 
+    {{#if start}}
+        <fieldset class="start-data">
+            <legend>{{localize "EFFECT.START.Header"}}</legend>
+            <div class="form-group">
+                <span class="label">{{localize "EFFECT.FIELDS.start.time.label"}}</span>
+                <div class="form-fields">{{start.time}}</div>
+            </div>
+            {{#if start.combat}}
+            <div class="form-group">
+                <span class="label">{{localize "DOCUMENT.Combat"}}</span>
                 <div class="form-fields">
-                    {{formInput systemFields.duration.fields.description value=source.system.duration.description localize=true }}
+                    {{localize "EFFECT.START.Combat" round=start.round turn=start.turn}}
                 </div>
             </div>
-
-        <div class="custom-duration-section">
-            {{formGroup fields.start.fields.time value=source.start.time localize=true }}
-            <div class="form-group slim duration" data-duration>
-                <label class="flexrow" for="{{rootId}}-duration.value">
-                    <span>{{localize "EFFECT.DURATION.Label"}}</span>
-                    <span class="warning" hidden><i class="fa-duotone fa-triangle-exclamation"></i></span>
-                </label>
+            {{#if start.combatant}}
+            <div class="form-group">
+                <span class="label">{{localize "DOCUMENT.Combatant"}}</span>
                 <div class="form-fields">
-                    {{formInput fields.duration.fields.value value=source.duration.value id=(concat rootId "-duration.value")
-                                aria=(object label=(localize "EFFECT.FIELDS.duration.value.label"))}}
-                    {{formInput fields.duration.fields.units value=source.duration.units id=(concat rootId "-duration.units")
-                                options=durationUnits aria=(object label=(localize "EFFECT.FIELDS.duration.units.label")) localize=true }}
+                    {{localize "EFFECT.START.Combatant" combatant=start.combatantName initiative=start.combatantInitiative}}
                 </div>
             </div>
+            {{/if}}
+            {{/if}}
+        </fieldset>
+    {{/if}} --}}
+
+     {{!-- <fieldset>
+        <legend>{{localize "EFFECT.DURATION.Header"}}</legend>
+        <div class="form-group slim duration" data-duration>
+            <label class="flexrow" for="{{rootId}}-duration.value">
+                <span>{{localize "EFFECT.DURATION.Label"}}</span>
+                <span class="warning" hidden><i class="fa-duotone fa-triangle-exclamation"></i></span>
+            </label>
+            <div class="form-fields">
+                {{formInput fields.duration.fields.value value=source.duration.value id=(concat rootId "-duration.value")
+                            aria=(object label=(localize "EFFECT.FIELDS.duration.value.label"))}}
+                {{formInput fields.duration.fields.units value=source.duration.units id=(concat rootId "-duration.units")
+                            options=durationUnits aria=(object label=(localize "EFFECT.FIELDS.duration.units.label"))}}
+            </div>
         </div>
-    </fieldset>
+        {{formGroup fields.duration.fields.expiry choices=expiryEvents value=source.duration.expiry rootId=rootId}}
+    </fieldset> --}}
 </section>
\ No newline at end of file
diff --git a/templates/ui/tooltip/effect-display.hbs b/templates/ui/tooltip/effect-display.hbs
index d37b5147..5ca4fec2 100644
--- a/templates/ui/tooltip/effect-display.hbs
+++ b/templates/ui/tooltip/effect-display.hbs
@@ -16,16 +16,6 @@
         </div>
     {{/if}}
 
-    {{#if effect.system.duration.type}}
-
-        <div class="duration-container">
-            <div class="duration-inner-container">
-                <span>{{localize "EFFECT.DURATION.Label"}}:</span>
-                <span>{{localize (concat "DAGGERHEART.CONFIG.ActiveEffectDuration." effect.system.duration.type )}}</span>
-            </div>
-        </div>
-    {{/if}}
-
     {{#unless effect.isLockedCondition}}
         <p class="close-hint">
             <i class="fa-solid fa-computer-mouse"></i> {{localize "DAGGERHEART.UI.EffectsDisplay.removeThing" thing=(localize "DAGGERHEART.GENERAL.Effect.single")}}
diff --git a/templates/ui/tooltip/effect.hbs b/templates/ui/tooltip/effect.hbs
index c5004a86..4430b91d 100644
--- a/templates/ui/tooltip/effect.hbs
+++ b/templates/ui/tooltip/effect.hbs
@@ -4,12 +4,4 @@
     {{#if description}}
         <div class="tooltip-description">{{{description}}}</div>
     {{/if}}
-    {{#if item.system.duration.type}}
-        <div class="tooltip-duration">
-            <div class="duration-inner-container">
-                <span>{{localize "EFFECT.DURATION.Label"}}:</span>
-                <span>{{localize (concat "DAGGERHEART.CONFIG.ActiveEffectDuration." item.system.duration.type )}}</span>
-            </div>
-        </div>
-    {{/if}}
 </div>
\ No newline at end of file