From 8178fa57384f08403a30a053bcdd4f4fdf9cfc2a Mon Sep 17 00:00:00 2001
From: WBHarry <89362246+WBHarry@users.noreply.github.com>
Date: Mon, 22 Dec 2025 16:58:53 +0100
Subject: [PATCH] [PR][Feature] Actor Sizes (#1433)

* Added support for adversary actor sizes

* .

* .

* Finished token implementation

* Fixed token-config

* Updated SRD adversaries

* .

* Added size to Beastform tokenData

* Fixed sizing for evolved beastforms

* Beastform compendium update

* .
---
 daggerheart.mjs                               |   2 +
 lang/en.json                                  |  20 +-
 .../settings/homebrewSettings.mjs             |   9 +
 .../sheets-configs/prototype-token-config.mjs |  21 +
 .../sheets-configs/token-config.mjs           |  21 +
 .../applications/sheets/items/beastform.mjs   |   1 +
 .../sidebar/tabs/actorDirectory.mjs           |  26 ++
 module/config/actorConfig.mjs                 |  38 ++
 module/data/activeEffect/beastformEffect.mjs  |  38 +-
 module/data/actor/adversary.mjs               |   5 +-
 module/data/actor/base.mjs                    |  10 +-
 module/data/actor/party.mjs                   |   2 +-
 module/data/fields/action/beastformField.mjs  |  12 +
 module/data/item/beastform.mjs                |  46 +-
 module/data/settings/Homebrew.mjs             |  32 ++
 module/documents/_module.mjs                  |   1 +
 module/documents/actor.mjs                    |  23 +-
 module/documents/scene.mjs                    |  40 ++
 module/documents/token.mjs                    | 438 +++++++++++++++++-
 ...ersary_Acid_Burrower_89yAh30vaNQOALlz.json |   6 +-
 ...ary_Adult_Flickerfly_G7jiltRjgvVhZewm.json |   3 +-
 ..._Apprentice_Assassin_vNIbYQ4YSzNf0WPE.json |   3 +-
 ...ary_Arch_Necromancer_WPEOIGfclNJxWb87.json |   3 +-
 ...versary_Archer_Guard_JRhrrEg5UroURiAD.json |   6 +-
 ...sary_Archer_Squadron_0ts6CGd93lLqGZI5.json |   3 +-
 ...ry_Assassin_Poisoner_h5RuhzGL17dW5FBT.json |   3 +-
 ...adversary_Battle_Box_dgH3fW9FTYLaIDvS.json |   3 +-
 .../adversary_Bear_71qKDLKO3CsrNkdy.json      |   3 +-
 ...versary_Bladed_Guard_B4LZcGuBAHzyVdzy.json |   3 +-
 ...ersary_Brawny_Zombie_2UeZ0tEe7AzgSJNd.json |   3 +-
 .../adversary_Cave_Ogre_8Zkqk1jU09nKL2fy.json |   3 +-
 ...dversary_Chaos_Skull_jDmHqGvzg5wjgmxE.json |   3 +-
 .../adversary_Conscript_99TqczuQipBmaB8i.json |   3 +-
 .../adversary_Construct_uOP5oT9QzXPlnf3p.json |   3 +-
 .../adversary_Courtesan_ZxWaWPdzFIUPNC62.json |   3 +-
 .../adversary_Courtier_CBBuEXAlLKFMJdjg.json  |   3 +-
 ...adversary_Cult_Adept_0NxCSugvKQ4W8OYZ.json |   3 +-
 .../adversary_Cult_Fang_tyBOpLfigAhI9bU3.json |   3 +-
 ...ersary_Cult_Initiate_zx99sOGTXicP4SSD.json |   3 +-
 ...ry_Deeproot_Defender_9x2xY9zwc3xzbXo5.json |   3 +-
 ...ary_Demon_of_Avarice_pnyjIGxxvurcWmTv.json |   3 +-
 ...ary_Demon_of_Despair_kE4dfhqmIQpNd44e.json |   3 +-
 ...sary_Demon_of_Hubris_2VN3BftageoTTIzu.json |   3 +-
 ...ry_Demon_of_Jealousy_SxSOkM4bcVOFyjbo.json |   3 +-
 ...rsary_Demon_of_Wrath_5lphJAgzoqZI3VoG.json |   3 +-
 ...y_Demonic_Hound_Pack_NoRZ1PqB8N5wcIw0.json |   3 +-
 .../adversary_Dire_Bat_tBWHW00epmMnkawe.json  |   3 +-
 .../adversary_Dire_Wolf_wNzeuQLfLUMvgHlQ.json |   3 +-
 .../adversary_Dryad_wR7cFKrHvRzbzhBT.json     |   3 +-
 ...ersary_Electric_Eels_TLzY1nDw0Bu9Ud40.json |   3 +-
 ...sary_Elemental_Spark_P7h54ZePFPHpYwvB.json |   3 +-
 ...ersary_Elite_Soldier_bfhVWMBUh61b9J6n.json |   3 +-
 ...ry_Failed_Experiment_ChwwVqowFw8hJQwT.json |   3 +-
 ...y_Fallen_Shock_Troop_OsLG2BjaEdTZUJU9.json |   3 +-
 ...sary_Fallen_Sorcerer_PELRry1vqjBzSAlr.json |   3 +-
 ...rlord__Realm_Breaker_hxZ0sgoFJubh5aj6.json |   3 +-
 ..._Undefeated_Champion_RXkZTwBRi4dJ3JE5.json |   3 +-
 ...ry_Giant_Beastmaster_8VZIgU12cB3cvlyH.json |   3 +-
 ...ersary_Giant_Brawler_YnObCleGjPT7yqEc.json |   3 +-
 ...dversary_Giant_Eagle_OMQ0v6PE8s1mSU0K.json |   3 +-
 ...ary_Giant_Mosquitoes_IIWV4ysJPFPnTP7W.json |   3 +-
 .../adversary_Giant_Rat_4PfLnaCrOcMdb4dK.json |   3 +-
 ...ersary_Giant_Recruit_5s8wSvpyC5rxY5aD.json |   3 +-
 ...rsary_Giant_Scorpion_fmfntuJ8mHRCAktP.json |   3 +-
 ...dversary_Glass_Snake_8KWVLWXFhlY2kYx0.json |   3 +-
 .../adversary_Gorgon_8mJYMpbLTb8qIOrr.json    |   3 +-
 ...ater_Earth_Elemental_dsfB3YhoL5SudvS2.json |   3 +-
 ...ater_Water_Elemental_xIICT6tEdnA7dKDV.json |   3 +-
 ...adversary_Green_Ooze_SHXedd9zZPVfUgUa.json |   3 +-
 ...sary_Hallowed_Archer_kabueAo6BALApWqp.json |   3 +-
 ...ary_Hallowed_Soldier_VENwg7xEFcYObjmT.json |   3 +-
 .../adversary_Harrier_uRtghKE9mHlII4rs.json   |   3 +-
 ...adversary_Head_Guard_mK3A5FTx6k8iPU3F.json |   3 +-
 ...versary_Head_Vampire_i2UNbRvgyoSs07M6.json |   3 +-
 ...dversary_High_Seraph_r1mbfSSwKWdcFdAU.json |   3 +-
 ...sary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json |   3 +-
 .../adversary_Hydra_MI126iMOOobQ1Obn.json     |   3 +-
 ..._Jagged_Knife_Bandit_5Lh1T0zaT8Pkr2U2.json |   3 +-
 ...y_Jagged_Knife_Hexer_MbBPIOxaxXYNApXz.json |   3 +-
 ...ed_Knife_Kneebreaker_CBKixLH3yhivZZuL.json |   3 +-
 ..._Jagged_Knife_Lackey_C0OMQqV7pN6t7ouR.json |   3 +-
 ...ged_Knife_Lieutenant_aTljstqteGoLpCBq.json |   3 +-
 ..._Jagged_Knife_Shadow_XF4tYTq9nPJAy2ox.json |   3 +-
 ..._Jagged_Knife_Sniper_1zuyof1XuIfi3aMG.json |   3 +-
 ..._Juvenile_Flickerfly_MYXmTx2FHcIjdfYZ.json |   3 +-
 ..._Knight_of_the_Realm_7ai2opemrclQe3VF.json |   3 +-
 .../adversary_Kraken_4nqv3ZwJGjnmic8j.json    |   3 +-
 ...versary_Masked_Thief_niBpVU7yeo5ccskE.json |   3 +-
 ...sary_Master_Assassin_dNta0cUzr96xcFhf.json |   3 +-
 .../adversary_Merchant_Al3w2CgjfdT3p9ma.json  |   3 +-
 ...rsary_Merchant_Baron_Vy02IhGhkJLuezu4.json |   3 +-
 ...inor_Chaos_Elemental_sRn4bqerfARvhgSV.json |   3 +-
 ...dversary_Minor_Demon_3tqCjDwJAQ7JKqMb.json |   3 +-
 ...Minor_Fire_Elemental_DscWkNVoHak6P4hh.json |   3 +-
 ...versary_Minor_Treant_G62k4oSkhkoXEs2D.json |   3 +-
 ...ary_Minotaur_Wrecker_rM9qCIYeWg9I0B4l.json |   3 +-
 .../adversary_Monarch_yx0vK2yfNVZKWUUi.json   |   3 +-
 ...ersary_Mortal_Hunter_mVV7a7KQAORoPMgZ.json |   3 +-
 ...adversary_Oak_Treant_XK78QUfY8c8Go8Uv.json |   3 +-
 ...rsary_Oracle_of_Doom_befIqd5IYKg6eUz2.json |   3 +-
 ...r_Realms_Abomination_A0SeeDzwjvqOsyof.json |   3 +-
 ...ter_Realms_Corrupter_ms6nuOl3NFkhPj1k.json |   3 +-
 ..._Outer_Realms_Thrall_moJhHgKqTKPS2WYS.json |   3 +-
 ...atchwork_Zombie_Hulk_EQTOAOUrkIvS2z88.json |   9 +-
 ...ary_Perfected_Zombie_CP6iRfHdyFWniTHY.json |   3 +-
 ...dversary_Petty_Noble_wycLpvebWdUqRhpP.json |   3 +-
 ...rsary_Pirate_Captain_OROJbjsqagVh7ECV.json |   3 +-
 ...rsary_Pirate_Raiders_5YgEajn0wa4i85kC.json |   3 +-
 ...versary_Pirate_Tough_mhcVkVFrzIJ18FDm.json |   3 +-
 .../adversary_Red_Ooze_9rVlbJVrDNn1x7PS.json  |   3 +-
 ...ersary_Rotted_Zombie_gP3fWTLzSFnpA8EJ.json |   3 +-
 ...ersary_Royal_Advisor_EtLJiTsilPPZvLUX.json |   3 +-
 ...ersary_Secret_Keeper_sLAccjvCWfeedbpI.json |   3 +-
 .../adversary_Sellsword_bgreCaQ6ap2DVpCr.json |   3 +-
 ...ary_Shambling_Zombie_2nXz4ilAY4xuhKLm.json |   3 +-
 .../adversary_Shark_YmVAkdNsyuXWTtYp.json     |   3 +-
 .../adversary_Siren_BK4jwyXSRx7IOQiO.json     |   3 +-
 ...sary_Skeleton_Archer_7X5q7a6ueeHs5oA9.json |   3 +-
 ...sary_Skeleton_Dredge_6l1a3Fazq8BoKIcc.json |   3 +-
 ...sary_Skeleton_Knight_Q9LaVTyXF9NF12C7.json |   3 +-
 ...ary_Skeleton_Warrior_10YIQl0lvCJXZLfX.json |   3 +-
 ...sary_Spectral_Archer_5tCkhnBByUIN5UdG.json |   3 +-
 ...ary_Spectral_Captain_65cSO3EQEh6ZH6Xk.json |   3 +-
 ...ry_Spectral_Guardian_UFVGl1osOsJTneLf.json |   3 +-
 ...adversary_Spellblade_ldbWEL7uZs84vyrR.json |   3 +-
 .../adversary_Spy_8zlynOhnVA59KpKT.json       |   3 +-
 ...dversary_Stag_Knight_KGVwnLq85ywP9xvB.json |   3 +-
 ...dversary_Stonewraith_3aAS2Qm3R6cgaYfE.json |   3 +-
 ...ersary_Swarm_of_Rats_qNgs3AbLyJrY19nt.json |   3 +-
 ...rsary_Sylvan_Soldier_VtFBt9XBE0WrGGxP.json |   3 +-
 ...Tangle_Bramble_Swarm_PKSXFuaIHUCoH63A.json |   3 +-
 ...rsary_Tangle_Bramble_XcAGOSmtCFLT1unN.json |   3 +-
 ...sary_Tiny_Green_Ooze_aLkLFuVoKz2NLoBK.json |   3 +-
 ...ersary_Tiny_Red_Ooze_1fkLQXVtmILqfJ44.json |   3 +-
 ...rsary_Treant_Sapling_o63nS0k3wHu6EgKP.json |   6 +-
 .../adversary_Vampire_WWyUp6Mxl1S3KYUG.json   |   3 +-
 ...ault_Guardian_Gaoler_JqYraOqNmmhHk4Yy.json |   3 +-
 ...lt_Guardian_Sentinel_FVgYb28fhxlVcGwA.json |   3 +-
 ...ault_Guardian_Turret_c5hGdvY5UnSjlHws.json |   3 +-
 ...Dragon__Ashen_Tyrant_pMuXGCSOQaxpi5tb.json |   3 +-
 ...agon__Molten_Scourge_eArAPuB38CNR0ZIM.json |   3 +-
 ...n__Obsidian_Predator_ladm7wykhZczYzrQ.json |   3 +-
 ...adversary_War_Wizard_noDdT0tsN6FXSmC8.json |   3 +-
 ...versary_Weaponmaster_ZNbQ2jg35LG4t9eH.json |   3 +-
 ...dversary_Young_Dryad_8yUj2Mzvnifhxegm.json |   3 +-
 ...ary_Young_Ice_Dragon_UGPiPLJsPvMTSKEF.json |   3 +-
 ...ersary_Zombie_Legion_YhJrP7rTBiRdX5Fp.json |   3 +-
 ...dversary_Zombie_Pack_Nf0v43rtflV56V2T.json |   3 +-
 ...eastform_Agile_Scout_a9UoCwtrbgKk02mK.json |   3 +-
 ...orm_Aquatic_Predator_ItBVeCl2u5uetgy7.json |   3 +-
 ...stform_Aquatic_Scout_qqzdFCxyYupWZK23.json |   3 +-
 ...tform_Armored_Sentry_8pUHJv3BYdjA4Qdf.json |   3 +-
 ...m_Epic_Aquatic_Beast_wT4xbF99I55yjKZV.json |   3 +-
 ...tform_Great_Predator_afbMt4Ld6nY3mw0N.json |   3 +-
 ...m_Great_Winged_Beast_b4BMnTbJ3iPPidSb.json |   3 +-
 ...orm_Household_Friend_iDmOtiHJJ80AIAVT.json |   3 +-
 ...orm_Massive_Behemoth_qjwMzPn33aKZACkv.json |   3 +-
 ...stform_Mighty_Lizard_94tvcC3D5Kp4lzuN.json |   3 +-
 ...tform_Mighty_Strider_zRLjqKx4Rn2TjivL.json |   3 +-
 ...Mythic_Aerial_Hunter_jV6EuEacyQlHW4SN.json |   3 +-
 ...stform_Nimble_Grazer_CItO8yX6amQaqyk7.json |   3 +-
 ...stform_Pack_Predator_YLisKYYhAGca50WM.json |   3 +-
 ...rm_Pouncing_Predator_33oFSZ1PwFqInHPe.json |   3 +-
 ...tform_Powerful_Beast_m8BVTuJI1wCvzTcf.json |   3 +-
 ...rm_Stalking_Arachnid_A4TVRY0D5r9EiVwA.json |   3 +-
 ...orm_Striking_Serpent_1XrZWGDttBAAUxR1.json |   3 +-
 ...form_Terrible_Lizard_5BABxRe2XVrYTj8N.json |   3 +-
 ...astform_Winged_Beast_mZ4Wlqtss2FlNNvL.json |   3 +-
 .../less/sheets/actors/adversary/header.less  |   1 +
 styles/less/sheets/items/beastform.less       |   3 +
 styles/less/ui/settings/settings.less         |   6 +
 .../settings/homebrew-settings/settings.hbs   |  14 +
 .../adversary-settings/details.hbs            |   1 +
 .../token-config/appearance.hbs               |  82 ++++
 templates/sheets/actors/adversary/header.hbs  |   8 +
 templates/sheets/items/beastform/settings.hbs |  39 +-
 176 files changed, 1198 insertions(+), 203 deletions(-)
 create mode 100644 module/documents/scene.mjs
 create mode 100644 templates/sheets-settings/token-config/appearance.hbs

diff --git a/daggerheart.mjs b/daggerheart.mjs
index acbffd38..08a1be02 100644
--- a/daggerheart.mjs
+++ b/daggerheart.mjs
@@ -53,6 +53,8 @@ CONFIG.Canvas.rulerClass = placeables.DhRuler;
 CONFIG.Canvas.layers.templates.layerClass = placeables.DhTemplateLayer;
 CONFIG.MeasuredTemplate.objectClass = placeables.DhMeasuredTemplate;
 
+CONFIG.Scene.documentClass = documents.DhScene;
+
 CONFIG.Token.documentClass = documents.DhToken;
 CONFIG.Token.prototypeSheetClass = applications.sheetConfigs.DhPrototypeTokenConfig;
 CONFIG.Token.objectClass = placeables.DhTokenPlaceable;
diff --git a/lang/en.json b/lang/en.json
index 8a3481c8..498a45cb 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -611,6 +611,9 @@
                 "insufficientHope": "The initiating character doesn't have enough hope",
                 "createTagTeam": "Create TagTeam Roll",
                 "chatMessageRollTitle": "Roll"
+            },
+            "TokenConfig": {
+                "actorSizeUsed": "Actor size is set, determining the dimensions"
             }
         },
         "CLASS": {
@@ -1147,6 +1150,14 @@
                 "rect": "Rectangle",
                 "ray": "Ray"
             },
+            "TokenSize": {
+                "tiny": "Tiny",
+                "small": "Small",
+                "medium": "Medium",
+                "large": "Large",
+                "huge": "Huge",
+                "gargantuan": "Gargantuan"
+            },
             "Traits": {
                 "agility": {
                     "name": "Agility",
@@ -2168,6 +2179,7 @@
                 "plural": "Targets"
             },
             "title": "Title",
+            "tokenSize": "Token Size",
             "total": "Total",
             "traitModifier": "Trait Modifier",
             "true": "True",
@@ -2224,6 +2236,7 @@
                     "tokenRingImg": { "label": "Subject Texture" },
                     "tokenSize": {
                         "placeholder": "Using character dimensions",
+                        "disabledPlaceholder": "Set by character size",
                         "height": { "label": "Height" },
                         "width": { "label": "Width" }
                     },
@@ -2249,7 +2262,9 @@
                 "hybridizeFeatureTitle": "Hybrid Features",
                 "hybridizeDrag": "Drag a form here to hybridize it.",
                 "mainTrait": "Main Trait",
-                "traitBonus": "Trait Bonus"
+                "traitBonus": "Trait Bonus",
+                "evolvedTokenHint": "An evolved beastform's token is based on that of the form you evolve",
+                "evolvedImagePlaceholder": "The image for the form selected for evolution will be used"
             },
             "Class": {
                 "hopeFeatures": "Hope Features",
@@ -2802,7 +2817,8 @@
                 "companionPartnerLevelBlock": "The companion needs an assigned partner to level up.",
                 "configureAttribution": "Configure Attribution",
                 "deleteItem": "Delete Item",
-                "immune": "Immune"
+                "immune": "Immune",
+                "tokenSize": "The token size used on the canvas"
             }
         }
     }
diff --git a/module/applications/settings/homebrewSettings.mjs b/module/applications/settings/homebrewSettings.mjs
index 6d36a2b3..3c4486c1 100644
--- a/module/applications/settings/homebrewSettings.mjs
+++ b/module/applications/settings/homebrewSettings.mjs
@@ -44,6 +44,7 @@ export default class DhHomebrewSettings extends HandlebarsApplicationMixin(Appli
             deleteAdversaryType: this.deleteAdversaryType,
             selectAdversaryType: this.selectAdversaryType,
             save: this.save,
+            resetTokenSizes: this.resetTokenSizes,
             reset: this.reset
         },
         form: { handler: this.updateData, submitOnChange: true }
@@ -424,6 +425,14 @@ export default class DhHomebrewSettings extends HandlebarsApplicationMixin(Appli
         this.close();
     }
 
+    static async resetTokenSizes() {
+        await this.settings.updateSource({
+            tokenSizes: this.settings.schema.fields.tokenSizes.initial
+        });
+
+        this.render();
+    }
+
     static async reset() {
         const confirmed = await foundry.applications.api.DialogV2.confirm({
             window: {
diff --git a/module/applications/sheets-configs/prototype-token-config.mjs b/module/applications/sheets-configs/prototype-token-config.mjs
index 24c9dabb..0bb9703a 100644
--- a/module/applications/sheets-configs/prototype-token-config.mjs
+++ b/module/applications/sheets-configs/prototype-token-config.mjs
@@ -1,4 +1,18 @@
 export default class DhPrototypeTokenConfig extends foundry.applications.sheets.PrototypeTokenConfig {
+    /** @override */
+    static PARTS = {
+        tabs: super.PARTS.tabs,
+        identity: super.PARTS.identity,
+        appearance: {
+            template: 'systems/daggerheart/templates/sheets-settings/token-config/appearance.hbs',
+            scrollable: ['']
+        },
+        vision: super.PARTS.vision,
+        light: super.PARTS.light,
+        resources: super.PARTS.resources,
+        footer: super.PARTS.footer
+    };
+
     /** @inheritDoc */
     async _prepareResourcesTab() {
         const token = this.token;
@@ -17,4 +31,11 @@ export default class DhPrototypeTokenConfig extends foundry.applications.sheets.
             turnMarkerAnimations: CONFIG.Combat.settings.turnMarkerAnimations
         };
     }
+
+    async _prepareAppearanceTab() {
+        const context = await super._prepareAppearanceTab();
+        context.actorSizeUsed = this.token.actor ? Boolean(this.token.actor.system.size) : false;
+
+        return context;
+    }
 }
diff --git a/module/applications/sheets-configs/token-config.mjs b/module/applications/sheets-configs/token-config.mjs
index ee573e5d..5f4e4f56 100644
--- a/module/applications/sheets-configs/token-config.mjs
+++ b/module/applications/sheets-configs/token-config.mjs
@@ -1,4 +1,18 @@
 export default class DhTokenConfig extends foundry.applications.sheets.TokenConfig {
+    /** @override */
+    static PARTS = {
+        tabs: super.PARTS.tabs,
+        identity: super.PARTS.identity,
+        appearance: {
+            template: 'systems/daggerheart/templates/sheets-settings/token-config/appearance.hbs',
+            scrollable: ['']
+        },
+        vision: super.PARTS.vision,
+        light: super.PARTS.light,
+        resources: super.PARTS.resources,
+        footer: super.PARTS.footer
+    };
+
     /** @inheritDoc */
     async _prepareResourcesTab() {
         const token = this.token;
@@ -17,4 +31,11 @@ export default class DhTokenConfig extends foundry.applications.sheets.TokenConf
             turnMarkerAnimations: CONFIG.Combat.settings.turnMarkerAnimations
         };
     }
+
+    async _prepareAppearanceTab() {
+        const context = await super._prepareAppearanceTab();
+        context.actorSizeUsed = this.token.actor ? Boolean(this.token.actor.system.size) : false;
+
+        return context;
+    }
 }
diff --git a/module/applications/sheets/items/beastform.mjs b/module/applications/sheets/items/beastform.mjs
index 1c4a4880..880c0796 100644
--- a/module/applications/sheets/items/beastform.mjs
+++ b/module/applications/sheets/items/beastform.mjs
@@ -77,6 +77,7 @@ export default class BeastformSheet extends DHBaseItemSheet {
                         name: context.document.system.advantageOn[key].value
                     }))
                 );
+                context.dimensionsDisabled = context.document.system.tokenSize.size !== 'custom';
                 break;
             case 'effects':
                 context.effects.actives = context.effects.actives.map(effect => {
diff --git a/module/applications/sidebar/tabs/actorDirectory.mjs b/module/applications/sidebar/tabs/actorDirectory.mjs
index 4a528e74..d40443a0 100644
--- a/module/applications/sidebar/tabs/actorDirectory.mjs
+++ b/module/applications/sidebar/tabs/actorDirectory.mjs
@@ -17,4 +17,30 @@ export default class DhActorDirectory extends foundry.applications.sidebar.tabs.
                   : null;
         };
     }
+
+    /** @inheritDoc */
+    _onDragStart(event) {
+        let actor;
+        const { entryId } = event.currentTarget.dataset;
+        if (entryId) {
+            actor = this.collection.get(entryId);
+            if (!actor?.visible) return false;
+        }
+        super._onDragStart(event);
+
+        // Create the drag preview.
+        if (actor && canvas.ready) {
+            const img = event.currentTarget.querySelector('img');
+            const pt = actor.prototypeToken;
+            const usesSize = actor.system.metadata.usesSize;
+            const tokenSizes = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).tokenSizes;
+            const width = usesSize ? tokenSizes[actor.system.size] : pt.width;
+            const height = usesSize ? tokenSizes[actor.system.size] : pt.height;
+
+            const w = width * canvas.dimensions.size * Math.abs(pt.texture.scaleX) * canvas.stage.scale.x;
+            const h = height * canvas.dimensions.size * Math.abs(pt.texture.scaleY) * canvas.stage.scale.y;
+            const preview = foundry.applications.ux.DragDrop.implementation.createDragImage(img, w, h);
+            event.dataTransfer.setDragImage(preview, w / 2, h / 2);
+        }
+    }
 }
diff --git a/module/config/actorConfig.mjs b/module/config/actorConfig.mjs
index 7ff42754..fdef7d03 100644
--- a/module/config/actorConfig.mjs
+++ b/module/config/actorConfig.mjs
@@ -211,6 +211,44 @@ export const adversaryTraits = {
     }
 };
 
+export const tokenSize = {
+    custom: {
+        id: 'custom',
+        value: 0,
+        label: 'DAGGERHEART.GENERAL.custom'
+    },
+    tiny: {
+        id: 'tiny',
+        value: 1,
+        label: 'DAGGERHEART.CONFIG.TokenSize.tiny'
+    },
+    small: {
+        id: 'small',
+        value: 2,
+        label: 'DAGGERHEART.CONFIG.TokenSize.small'
+    },
+    medium: {
+        id: 'medium',
+        value: 3,
+        label: 'DAGGERHEART.CONFIG.TokenSize.medium'
+    },
+    large: {
+        id: 'large',
+        value: 4,
+        label: 'DAGGERHEART.CONFIG.TokenSize.large'
+    },
+    huge: {
+        id: 'huge',
+        value: 5,
+        label: 'DAGGERHEART.CONFIG.TokenSize.huge'
+    },
+    gargantuan: {
+        id: 'gargantuan',
+        value: 6,
+        label: 'DAGGERHEART.CONFIG.TokenSize.gargantuan'
+    }
+};
+
 export const levelChoices = {
     attributes: {
         name: 'attributes',
diff --git a/module/data/activeEffect/beastformEffect.mjs b/module/data/activeEffect/beastformEffect.mjs
index b5e775fc..b041b59e 100644
--- a/module/data/activeEffect/beastformEffect.mjs
+++ b/module/data/activeEffect/beastformEffect.mjs
@@ -65,20 +65,30 @@ export default class BeastformEffect extends BaseEffect {
                 }
             };
 
-            const updateToken = token => ({
-                ...baseUpdate,
-                'texture': {
-                    enabled: this.characterTokenData.usesDynamicToken,
-                    src: token.flags.daggerheart?.beastformTokenImg ?? this.characterTokenData.tokenImg
-                },
-                'ring': {
-                    subject: {
-                        texture:
-                            token.flags.daggerheart?.beastformSubjectTexture ?? this.characterTokenData.tokenRingImg
-                    }
-                },
-                'flags.daggerheart': { '-=beastformTokenImg': null, '-=beastformSubjectTexture': null }
-            });
+            const updateToken = token => {
+                const { x, y } = game.system.api.documents.DhToken.getSnappedPositionInSquareGrid(
+                    token.object.scene.grid,
+                    { x: token.x, y: token.y, elevation: token.elevation },
+                    baseUpdate.width,
+                    baseUpdate.height
+                );
+                return {
+                    ...baseUpdate,
+                    x,
+                    y,
+                    'texture': {
+                        enabled: this.characterTokenData.usesDynamicToken,
+                        src: token.flags.daggerheart?.beastformTokenImg ?? this.characterTokenData.tokenImg
+                    },
+                    'ring': {
+                        subject: {
+                            texture:
+                                token.flags.daggerheart?.beastformSubjectTexture ?? this.characterTokenData.tokenRingImg
+                        }
+                    },
+                    'flags.daggerheart': { '-=beastformTokenImg': null, '-=beastformSubjectTexture': null }
+                };
+            };
 
             await updateActorTokens(this.parent.parent, update, updateToken);
 
diff --git a/module/data/actor/adversary.mjs b/module/data/actor/adversary.mjs
index bb8df3ee..a7b66d4d 100644
--- a/module/data/actor/adversary.mjs
+++ b/module/data/actor/adversary.mjs
@@ -11,7 +11,8 @@ export default class DhpAdversary extends BaseDataActor {
             label: 'TYPES.Actor.adversary',
             type: 'adversary',
             settingSheet: DHAdversarySettings,
-            hasAttribution: true
+            hasAttribution: true,
+            usesSize: true
         });
     }
 
@@ -142,7 +143,7 @@ export default class DhpAdversary extends BaseDataActor {
     }
 
     isItemValid(source) {
-        return source.type === "feature";
+        return source.type === 'feature';
     }
 
     async _preUpdate(changes, options, user) {
diff --git a/module/data/actor/base.mjs b/module/data/actor/base.mjs
index f3662da2..29b0af28 100644
--- a/module/data/actor/base.mjs
+++ b/module/data/actor/base.mjs
@@ -42,7 +42,8 @@ export default class BaseDataActor extends foundry.abstract.TypeDataModel {
             settingSheet: null,
             hasResistances: true,
             hasAttribution: false,
-            hasLimitedView: true
+            hasLimitedView: true,
+            usesSize: false
         };
     }
 
@@ -77,6 +78,13 @@ export default class BaseDataActor extends foundry.abstract.TypeDataModel {
                     'DAGGERHEART.GENERAL.DamageResistance.magicalReduction'
                 )
             });
+        if (this.metadata.usesSize)
+            schema.size = new fields.StringField({
+                required: true,
+                nullable: false,
+                choices: CONFIG.DH.ACTOR.tokenSize,
+                initial: CONFIG.DH.ACTOR.tokenSize.custom.id
+            });
         return schema;
     }
 
diff --git a/module/data/actor/party.mjs b/module/data/actor/party.mjs
index b306c486..236d65db 100644
--- a/module/data/actor/party.mjs
+++ b/module/data/actor/party.mjs
@@ -26,7 +26,7 @@ export default class DhParty extends BaseDataActor {
     /* -------------------------------------------- */
 
     isItemValid(source) {
-        return ["weapon", "armor", "consumable", "loot"].includes(source.type);
+        return ['weapon', 'armor', 'consumable', 'loot'].includes(source.type);
     }
 
     prepareBaseData() {
diff --git a/module/data/fields/action/beastformField.mjs b/module/data/fields/action/beastformField.mjs
index 6ec5fdac..6185f0f8 100644
--- a/module/data/fields/action/beastformField.mjs
+++ b/module/data/fields/action/beastformField.mjs
@@ -92,6 +92,18 @@ export default class BeastformField extends fields.SchemaField {
 
             beastformEffect.changes = [...beastformEffect.changes, ...evolvedForm.changes];
             formData.system.features = [...formData.system.features, ...selectedForm.system.features.map(x => x.uuid)];
+
+            const baseSize = evolvedData.form.system.tokenSize.size;
+            const evolvedSize =
+                baseSize === 'custom'
+                    ? 'custom'
+                    : (Object.keys(CONFIG.DH.ACTOR.tokenSize).find(
+                          x => CONFIG.DH.ACTOR.tokenSize[x].value === CONFIG.DH.ACTOR.tokenSize[baseSize].value + 1
+                      ) ?? baseSize);
+            formData.system.tokenSize = {
+                ...evolvedData.form.system.tokenSize,
+                size: evolvedSize
+            };
         }
 
         if (selectedForm.system.beastformType === CONFIG.DH.ITEM.beastformTypes.hybrid.id) {
diff --git a/module/data/item/beastform.mjs b/module/data/item/beastform.mjs
index 51ca298d..669cd4b1 100644
--- a/module/data/item/beastform.mjs
+++ b/module/data/item/beastform.mjs
@@ -43,6 +43,12 @@ export default class DHBeastform extends BaseDataItem {
                 base64: false
             }),
             tokenSize: new fields.SchemaField({
+                size: new fields.StringField({
+                    required: true,
+                    nullable: false,
+                    choices: CONFIG.DH.ACTOR.tokenSize,
+                    initial: CONFIG.DH.ACTOR.tokenSize.custom.id
+                }),
                 height: new fields.NumberField({ integer: true, min: 1, initial: null, nullable: true }),
                 width: new fields.NumberField({ integer: true, min: 1, initial: null, nullable: true })
             }),
@@ -190,9 +196,18 @@ export default class DHBeastform extends BaseDataItem {
 
         await this.parent.parent.createEmbeddedDocuments('ActiveEffect', [beastformEffect.toObject()]);
 
+        const autoTokenSize =
+            this.tokenSize.size !== 'custom'
+                ? game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).tokenSizes[
+                      this.tokenSize.size
+                  ]
+                : null;
+        const width = autoTokenSize ?? this.tokenSize.width;
+        const height = autoTokenSize ?? this.tokenSize.height;
+
         const prototypeTokenUpdate = {
-            height: this.tokenSize.height,
-            width: this.tokenSize.width,
+            height,
+            width,
             texture: {
                 src: this.tokenImg
             },
@@ -202,16 +217,25 @@ export default class DHBeastform extends BaseDataItem {
                 }
             }
         };
-
-        const tokenUpdate = token => ({
-            ...prototypeTokenUpdate,
-            flags: {
-                daggerheart: {
-                    beastformTokenImg: token.texture.src,
-                    beastformSubjectTexture: token.ring.subject.texture
+        const tokenUpdate = token => {
+            const { x, y } = game.system.api.documents.DhToken.getSnappedPositionInSquareGrid(
+                token.object.scene.grid,
+                { x: token.x, y: token.y, elevation: token.elevation },
+                width ?? token.width,
+                height ?? token.height
+            );
+            return {
+                ...prototypeTokenUpdate,
+                x,
+                y,
+                flags: {
+                    daggerheart: {
+                        beastformTokenImg: token.texture.src,
+                        beastformSubjectTexture: token.ring.subject.texture
+                    }
                 }
-            }
-        });
+            };
+        };
 
         await updateActorTokens(this.parent.parent, prototypeTokenUpdate, tokenUpdate);
 
diff --git a/module/data/settings/Homebrew.mjs b/module/data/settings/Homebrew.mjs
index 6f280cbd..7572c9ea 100644
--- a/module/data/settings/Homebrew.mjs
+++ b/module/data/settings/Homebrew.mjs
@@ -40,6 +40,38 @@ export default class DhHomebrew extends foundry.abstract.DataModel {
             traitArray: new fields.ArrayField(new fields.NumberField({ required: true, integer: true }), {
                 initial: () => [2, 1, 1, 0, 0, -1]
             }),
+            tokenSizes: new fields.SchemaField({
+                tiny: new fields.NumberField({
+                    integer: false,
+                    initial: 0.5,
+                    label: 'DAGGERHEART.CONFIG.TokenSize.tiny'
+                }),
+                small: new fields.NumberField({
+                    integer: false,
+                    initial: 0.8,
+                    label: 'DAGGERHEART.CONFIG.TokenSize.small'
+                }),
+                medium: new fields.NumberField({
+                    integer: false,
+                    initial: 1,
+                    label: 'DAGGERHEART.CONFIG.TokenSize.medium'
+                }),
+                large: new fields.NumberField({
+                    integer: false,
+                    initial: 2,
+                    label: 'DAGGERHEART.CONFIG.TokenSize.large'
+                }),
+                huge: new fields.NumberField({
+                    integer: false,
+                    initial: 3,
+                    label: 'DAGGERHEART.CONFIG.TokenSize.huge'
+                }),
+                gargantuan: new fields.NumberField({
+                    integer: false,
+                    initial: 4,
+                    label: 'DAGGERHEART.CONFIG.TokenSize.gargantuan'
+                })
+            }),
             currency: new fields.SchemaField({
                 title: new fields.StringField({
                     required: true,
diff --git a/module/documents/_module.mjs b/module/documents/_module.mjs
index af1e9942..22718bea 100644
--- a/module/documents/_module.mjs
+++ b/module/documents/_module.mjs
@@ -4,6 +4,7 @@ export { default as DhpCombat } from './combat.mjs';
 export { default as DHCombatant } from './combatant.mjs';
 export { default as DhActiveEffect } from './activeEffect.mjs';
 export { default as DhChatMessage } from './chatMessage.mjs';
+export { default as DhScene } from './scene.mjs';
 export { default as DhToken } from './token.mjs';
 export { default as DhTooltipManager } from './tooltipManager.mjs';
 export { default as DhTemplateManager } from './templateManager.mjs';
diff --git a/module/documents/actor.mjs b/module/documents/actor.mjs
index 3e1a9eca..06b60447 100644
--- a/module/documents/actor.mjs
+++ b/module/documents/actor.mjs
@@ -74,16 +74,27 @@ export default class DhpActor extends Actor {
     /**@inheritdoc */
     async _preCreate(data, options, user) {
         if ((await super._preCreate(data, options, user)) === false) return false;
+        const update = {};
+
+        // Set default token size. Done here as we do not want to set a datamodel default, since that would apply the sizing to third party actor modules that aren't set up with the size system.
+        if (this.system.metadata.usesSize && !data.system?.size) {
+            Object.assign(update, {
+                system: {
+                    size: CONFIG.DH.ACTOR.tokenSize.medium.id
+                }
+            });
+        }
 
         // Configure prototype token settings
-        const prototypeToken = {};
         if (['character', 'companion', 'party'].includes(this.type))
-            Object.assign(prototypeToken, {
-                sight: { enabled: true },
-                actorLink: true,
-                disposition: CONST.TOKEN_DISPOSITIONS.FRIENDLY
+            Object.assign(update, {
+                prototypeToken: {
+                    sight: { enabled: true },
+                    actorLink: true,
+                    disposition: CONST.TOKEN_DISPOSITIONS.FRIENDLY
+                }
             });
-        this.updateSource({ prototypeToken });
+        this.updateSource(update);
     }
 
     _onUpdate(changes, options, userId) {
diff --git a/module/documents/scene.mjs b/module/documents/scene.mjs
new file mode 100644
index 00000000..c6cdd2c2
--- /dev/null
+++ b/module/documents/scene.mjs
@@ -0,0 +1,40 @@
+import DHToken from './token.mjs';
+
+export default class DhScene extends Scene {
+    /** A map of `TokenDocument` IDs embedded in this scene long with new dimensions from actor size-category changes */
+    #sizeSyncBatch = new Map();
+
+    /** Synchronize a token's dimensions with its actor's size category. */
+    syncTokenDimensions(tokenDoc, tokenSize) {
+        if (!tokenDoc.parent?.tokens.has(tokenDoc.id)) return;
+        const prototype = tokenDoc.actor?.prototypeToken ?? tokenDoc;
+        this.#sizeSyncBatch.set(tokenDoc.id, {
+            size: tokenSize,
+            prototypeSize: { width: prototype.width, height: prototype.height },
+            position: { x: tokenDoc.x, y: tokenDoc.y, elevation: tokenDoc.elevation }
+        });
+        this.#processSyncBatch();
+    }
+
+    /** Retrieve size and clear size-sync batch, make updates. */
+    #processSyncBatch = foundry.utils.debounce(() => {
+        const tokenSizes = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).tokenSizes;
+        const entries = this.#sizeSyncBatch
+            .entries()
+            .toArray()
+            .map(([_id, { size, prototypeSize, position }]) => {
+                const tokenSize = tokenSizes[size];
+                const width = size !== CONFIG.DH.ACTOR.tokenSize.custom.id ? tokenSize : prototypeSize.width;
+                const height = size !== CONFIG.DH.ACTOR.tokenSize.custom.id ? tokenSize : prototypeSize.height;
+                const updatedPosition = DHToken.getSnappedPositionInSquareGrid(this.grid, position, width, height);
+                return {
+                    _id,
+                    width,
+                    height,
+                    ...updatedPosition
+                };
+            });
+        this.#sizeSyncBatch.clear();
+        this.updateEmbeddedDocuments('Token', entries, { animation: { movementSpeed: 1.5 } });
+    }, 0);
+}
diff --git a/module/documents/token.mjs b/module/documents/token.mjs
index 6996708b..c3babaa1 100644
--- a/module/documents/token.mjs
+++ b/module/documents/token.mjs
@@ -1,4 +1,4 @@
-export default class DHToken extends TokenDocument {
+export default class DHToken extends CONFIG.Token.documentClass {
     /**
      * Inspect the Actor data model and identify the set of attributes which could be used for a Token Bar.
      * @param {object} attributes       The tracked attributes which can be chosen from
@@ -100,4 +100,440 @@ export default class DHToken extends TokenDocument {
         }
         super.deleteCombatants(tokens, combat ?? {});
     }
+
+    /**@inheritdoc */
+    static async _preCreateOperation(documents, operation, user) {
+        const allowed = await super._preCreateOperation(documents, operation, user);
+        if (allowed === false) return false;
+
+        const tokenSizes = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).tokenSizes;
+        for (const document of documents) {
+            const actor = document.actor;
+            if (actor?.system.metadata.usesSize) {
+                const tokenSize = tokenSizes[actor.system.size];
+                if (tokenSize && actor.system.size !== CONFIG.DH.ACTOR.tokenSize.custom.id) {
+                    document.updateSource({
+                        width: tokenSize,
+                        height: tokenSize
+                    });
+                }
+            }
+        }
+    }
+
+    /**@inheritdoc */
+    _onRelatedUpdate(update = {}, operation = {}) {
+        super._onRelatedUpdate(update, operation);
+
+        if (!this.actor?.isOwner) return;
+
+        const updates = Array.isArray(update) ? update : [update];
+        const activeGM = game.users.activeGM; // Let the active GM take care of updates if available
+        for (let update of updates) {
+            if (
+                this.actor.system.metadata.usesSize &&
+                update.system?.size &&
+                activeGM &&
+                game.user.id === activeGM.id
+            ) {
+                const tokenSizes = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).tokenSizes;
+                const tokenSize = tokenSizes[update.system.size];
+                if (tokenSize !== this.width || tokenSize !== this.height) {
+                    this.parent?.syncTokenDimensions(this, update.system.size);
+                }
+            }
+        }
+    }
+
+    /**@inheritdoc */
+    getSnappedPosition(data = {}) {
+        const grid = this.parent?.grid ?? BaseScene.defaultGrid;
+        const x = data.x ?? this.x;
+        const y = data.y ?? this.y;
+        let elevation = data.elevation ?? this.elevation;
+        const unsnapped = { x, y, elevation };
+
+        // Gridless grid
+        if (grid.isGridless) return unsnapped;
+
+        // Get position and elevation
+        elevation = Math.round(elevation / grid.distance) * grid.distance;
+
+        let width = data.width ?? this.width;
+        let height = data.height ?? this.height;
+
+        if (this.actor?.system.metadata.usesSize) {
+            const tokenSizes = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).tokenSizes;
+            const tokenSize = tokenSizes[this.actor.system.size];
+            if (tokenSize && this.actor.system.size !== CONFIG.DH.ACTOR.tokenSize.custom.id) {
+                width = tokenSize ?? width;
+                height = tokenSize ?? height;
+            }
+        }
+
+        // Round width and height to nearest multiple of 0.5 if not small
+        width = width < 1 ? width : Math.round(width * 2) / 2;
+        height = height < 1 ? height : Math.round(height * 2) / 2;
+        const shape = data.shape ?? this.shape;
+
+        // Square grid
+        let snapped;
+        if (grid.isSquare) snapped = DHToken.getSnappedPositionInSquareGrid(grid, unsnapped, width, height);
+        // Hexagonal grid
+        else snapped = DHToken.getSnappedPositionInHexagonalGrid(grid, unsnapped, width, height, shape);
+        return { x: snapped.x, y: snapped.y, elevation };
+    }
+
+    static getSnappedPositionInSquareGrid(grid, position, width, height) {
+        const M = CONST.GRID_SNAPPING_MODES;
+        // Small tokens snap to any vertex of the subgrid with resolution 4
+        // where the token is fully contained within the grid space
+        const isTiny = (width === 0.5 && height <= 1) || (width <= 1 && height === 0.5);
+        if (isTiny) {
+            let x = position.x / grid.size;
+            let y = position.y / grid.size;
+            if (width === 1) x = Math.round(x);
+            else {
+                x = Math.floor(x * 8);
+                const k = ((x % 8) + 8) % 8;
+                if (k >= 6) x = Math.ceil(x / 8);
+                else if (k === 5) x = Math.floor(x / 8) + 0.5;
+                else x = Math.round(x / 2) / 4;
+            }
+            if (height === 1) y = Math.round(y);
+            else {
+                y = Math.floor(y * 8);
+                const k = ((y % 8) + 8) % 8;
+                if (k >= 6) y = Math.ceil(y / 8);
+                else if (k === 5) y = Math.floor(y / 8) + 0.5;
+                else y = Math.round(y / 2) / 4;
+            }
+
+            x *= grid.size;
+            y *= grid.size;
+
+            return { x, y };
+        } else if (width < 1 && height < 1) {
+            // isSmall
+            let xGrid = Math.round(position.x / grid.size);
+            let yGrid = Math.round(position.y / grid.size);
+
+            const x = xGrid * grid.size + grid.size / 2 - (width * grid.size) / 2;
+            const y = yGrid * grid.size + grid.size / 2 - (height * grid.size) / 2;
+
+            return { x, y };
+        }
+
+        const modeX = Number.isInteger(width) ? M.VERTEX : M.VERTEX | M.EDGE_MIDPOINT | M.CENTER;
+        const modeY = Number.isInteger(height) ? M.VERTEX : M.VERTEX | M.EDGE_MIDPOINT | M.CENTER;
+
+        if (modeX === modeY) return grid.getSnappedPoint(position, { mode: modeX });
+
+        return {
+            x: grid.getSnappedPoint(position, { mode: modeX }).x,
+            y: grid.getSnappedPoint(position, { mode: modeY }).y
+        };
+    }
+
+    //#region CopyPasta for mean private methods that have to be duplicated
+    static getSnappedPositionInHexagonalGrid(grid, position, width, height, shape) {
+        // Hexagonal shape
+        const hexagonalShape = DHToken.#getHexagonalShape(width, height, shape, grid.columns);
+        if (hexagonalShape) {
+            const offsetX = hexagonalShape.anchor.x * grid.sizeX;
+            const offsetY = hexagonalShape.anchor.y * grid.sizeY;
+            position = grid.getCenterPoint({ x: position.x + offsetX, y: position.y + offsetY });
+            position.x -= offsetX;
+            position.y -= offsetY;
+            return position;
+        }
+
+        // Rectagular shape
+        const M = CONST.GRID_SNAPPING_MODES;
+        return grid.getSnappedPoint(position, { mode: M.CENTER | M.VERTEX | M.CORNER | M.SIDE_MIDPOINT });
+    }
+
+    /**
+     * The cache of hexagonal shapes.
+     * @type {Map<string, DeepReadonly<TokenHexagonalShapeData>>}
+     */
+    static #hexagonalShapes = new Map();
+
+    static #getHexagonalShape(width, height, shape, columns) {
+        if (!Number.isInteger(width * 2) || !Number.isInteger(height * 2)) return null;
+
+        // TODO: can we set a max of 2^13 on width and height so that we may use an integer key?
+        const key = `${width},${height},${shape}${columns ? 'C' : 'R'}`;
+        let data = DHToken.#hexagonalShapes.get(key);
+        if (data) return data;
+
+        // Hexagon symmetry
+        if (columns) {
+            const rowData = BaseToken.#getHexagonalShape(height, width, shape, false);
+            if (!rowData) return null;
+
+            // Transpose the offsets/points of the shape in row orientation
+            const offsets = { even: [], odd: [] };
+            for (const { i, j } of rowData.offsets.even) offsets.even.push({ i: j, j: i });
+            for (const { i, j } of rowData.offsets.odd) offsets.odd.push({ i: j, j: i });
+            offsets.even.sort(({ i: i0, j: j0 }, { i: i1, j: j1 }) => j0 - j1 || i0 - i1);
+            offsets.odd.sort(({ i: i0, j: j0 }, { i: i1, j: j1 }) => j0 - j1 || i0 - i1);
+            const points = [];
+            for (let i = rowData.points.length; i > 0; i -= 2) {
+                points.push(rowData.points[i - 1], rowData.points[i - 2]);
+            }
+            data = {
+                offsets,
+                points,
+                center: { x: rowData.center.y, y: rowData.center.x },
+                anchor: { x: rowData.anchor.y, y: rowData.anchor.x }
+            };
+        }
+
+        // Small hexagon
+        else if (width === 0.5 && height === 0.5) {
+            data = {
+                offsets: { even: [{ i: 0, j: 0 }], odd: [{ i: 0, j: 0 }] },
+                points: [0.25, 0.0, 0.5, 0.125, 0.5, 0.375, 0.25, 0.5, 0.0, 0.375, 0.0, 0.125],
+                center: { x: 0.25, y: 0.25 },
+                anchor: { x: 0.25, y: 0.25 }
+            };
+        }
+
+        // Normal hexagon
+        else if (width === 1 && height === 1) {
+            data = {
+                offsets: { even: [{ i: 0, j: 0 }], odd: [{ i: 0, j: 0 }] },
+                points: [0.5, 0.0, 1.0, 0.25, 1, 0.75, 0.5, 1.0, 0.0, 0.75, 0.0, 0.25],
+                center: { x: 0.5, y: 0.5 },
+                anchor: { x: 0.5, y: 0.5 }
+            };
+        }
+
+        // Hexagonal ellipse or trapezoid
+        else if (shape <= CONST.TOKEN_SHAPES.TRAPEZOID_2) {
+            data = DHToken.#createHexagonalEllipseOrTrapezoid(width, height, shape);
+        }
+
+        // Hexagonal rectangle
+        else if (shape <= CONST.TOKEN_SHAPES.RECTANGLE_2) {
+            data = DHToken.#createHexagonalRectangle(width, height, shape);
+        }
+
+        // Cache the shape
+        if (data) {
+            foundry.utils.deepFreeze(data);
+            DHToken.#hexagonalShapes.set(key, data);
+        }
+
+        return data;
+    }
+
+    static #createHexagonalEllipseOrTrapezoid(width, height, shape) {
+        if (!Number.isInteger(width) || !Number.isInteger(height)) return null;
+        const points = [];
+        let top;
+        let bottom;
+        switch (shape) {
+            case CONST.TOKEN_SHAPES.ELLIPSE_1:
+                if (height >= 2 * width) return null;
+                top = Math.floor(height / 2);
+                bottom = Math.floor((height - 1) / 2);
+                break;
+            case CONST.TOKEN_SHAPES.ELLIPSE_2:
+                if (height >= 2 * width) return null;
+                top = Math.floor((height - 1) / 2);
+                bottom = Math.floor(height / 2);
+                break;
+            case CONST.TOKEN_SHAPES.TRAPEZOID_1:
+                if (height > width) return null;
+                top = height - 1;
+                bottom = 0;
+                break;
+            case CONST.TOKEN_SHAPES.TRAPEZOID_2:
+                if (height > width) return null;
+                top = 0;
+                bottom = height - 1;
+                break;
+        }
+        const offsets = { even: [], odd: [] };
+        for (let i = bottom; i > 0; i--) {
+            for (let j = 0; j < width - i; j++) {
+                offsets.even.push({ i: bottom - i, j: j + (((bottom & 1) + i + 1) >> 1) });
+                offsets.odd.push({ i: bottom - i, j: j + (((bottom & 1) + i) >> 1) });
+            }
+        }
+        for (let i = 0; i <= top; i++) {
+            for (let j = 0; j < width - i; j++) {
+                offsets.even.push({ i: bottom + i, j: j + (((bottom & 1) + i + 1) >> 1) });
+                offsets.odd.push({ i: bottom + i, j: j + (((bottom & 1) + i) >> 1) });
+            }
+        }
+        let x = 0.5 * bottom;
+        let y = 0.25;
+        for (let k = width - bottom; k--; ) {
+            points.push(x, y);
+            x += 0.5;
+            y -= 0.25;
+            points.push(x, y);
+            x += 0.5;
+            y += 0.25;
+        }
+        points.push(x, y);
+        for (let k = bottom; k--; ) {
+            y += 0.5;
+            points.push(x, y);
+            x += 0.5;
+            y += 0.25;
+            points.push(x, y);
+        }
+        y += 0.5;
+        for (let k = top; k--; ) {
+            points.push(x, y);
+            x -= 0.5;
+            y += 0.25;
+            points.push(x, y);
+            y += 0.5;
+        }
+        for (let k = width - top; k--; ) {
+            points.push(x, y);
+            x -= 0.5;
+            y += 0.25;
+            points.push(x, y);
+            x -= 0.5;
+            y -= 0.25;
+        }
+        points.push(x, y);
+        for (let k = top; k--; ) {
+            y -= 0.5;
+            points.push(x, y);
+            x -= 0.5;
+            y -= 0.25;
+            points.push(x, y);
+        }
+        y -= 0.5;
+        for (let k = bottom; k--; ) {
+            points.push(x, y);
+            x += 0.5;
+            y -= 0.25;
+            points.push(x, y);
+            y -= 0.5;
+        }
+        return {
+            offsets,
+            points,
+            // We use the centroid of the polygon for ellipse and trapzoid shapes
+            center: foundry.utils.polygonCentroid(points),
+            anchor: bottom % 2 ? { x: 0.0, y: 0.5 } : { x: 0.5, y: 0.5 }
+        };
+    }
+
+    /**
+     * Create the row-based hexagonal rectangle given the type, width, and height.
+     * @param {number} width                      The width of the Token (positive)
+     * @param {number} height                     The height of the Token (positive)
+     * @param {TokenShapeType} shape              The shape type (must be RECTANGLE_1 or RECTANGLE_2)
+     * @returns {TokenHexagonalShapeData|null}    The hexagonal shape or null if there is no shape
+     *                                            for the given combination of arguments
+     */
+    static #createHexagonalRectangle(width, height, shape) {
+        if (width < 1 || !Number.isInteger(height)) return null;
+        if (width === 1 && height > 1) return null;
+        if (!Number.isInteger(width) && height === 1) return null;
+
+        const even = shape === CONST.TOKEN_SHAPES.RECTANGLE_1 || height === 1;
+        const offsets = { even: [], odd: [] };
+        for (let i = 0; i < height; i++) {
+            const j0 = even ? 0 : (i + 1) & 1;
+            const j1 = ((width + (i & 1) * 0.5) | 0) - (even ? i & 1 : 0);
+            for (let j = j0; j < j1; j++) {
+                offsets.even.push({ i, j: j + (i & 1) });
+                offsets.odd.push({ i, j });
+            }
+        }
+        let x = even ? 0.0 : 0.5;
+        let y = 0.25;
+        const points = [x, y];
+        while (x + 1 <= width) {
+            x += 0.5;
+            y -= 0.25;
+            points.push(x, y);
+            x += 0.5;
+            y += 0.25;
+            points.push(x, y);
+        }
+        if (x !== width) {
+            y += 0.5;
+            points.push(x, y);
+            x += 0.5;
+            y += 0.25;
+            points.push(x, y);
+        }
+        while (y + 1.5 <= 0.75 * height) {
+            y += 0.5;
+            points.push(x, y);
+            x -= 0.5;
+            y += 0.25;
+            points.push(x, y);
+            y += 0.5;
+            points.push(x, y);
+            x += 0.5;
+            y += 0.25;
+            points.push(x, y);
+        }
+        if (y + 0.75 < 0.75 * height) {
+            y += 0.5;
+            points.push(x, y);
+            x -= 0.5;
+            y += 0.25;
+            points.push(x, y);
+        }
+        y += 0.5;
+        points.push(x, y);
+        while (x - 1 >= 0) {
+            x -= 0.5;
+            y += 0.25;
+            points.push(x, y);
+            x -= 0.5;
+            y -= 0.25;
+            points.push(x, y);
+        }
+        if (x !== 0) {
+            y -= 0.5;
+            points.push(x, y);
+            x -= 0.5;
+            y -= 0.25;
+            points.push(x, y);
+        }
+        while (y - 1.5 > 0) {
+            y -= 0.5;
+            points.push(x, y);
+            x += 0.5;
+            y -= 0.25;
+            points.push(x, y);
+            y -= 0.5;
+            points.push(x, y);
+            x -= 0.5;
+            y -= 0.25;
+            points.push(x, y);
+        }
+        if (y - 0.75 > 0) {
+            y -= 0.5;
+            points.push(x, y);
+            x += 0.5;
+            y -= 0.25;
+            points.push(x, y);
+        }
+        return {
+            offsets,
+            points,
+            // We use center of the rectangle (and not the centroid of the polygon) for the rectangle shapes
+            center: {
+                x: width / 2,
+                y: (0.75 * Math.floor(height) + 0.5 * (height % 1) + 0.25) / 2
+            },
+            anchor: even ? { x: 0.5, y: 0.5 } : { x: 0.0, y: 0.5 }
+        };
+    }
+    //#endregion
 }
diff --git a/src/packs/adversaries/adversary_Acid_Burrower_89yAh30vaNQOALlz.json b/src/packs/adversaries/adversary_Acid_Burrower_89yAh30vaNQOALlz.json
index 1d4cf11a..e93017f9 100644
--- a/src/packs/adversaries/adversary_Acid_Burrower_89yAh30vaNQOALlz.json
+++ b/src/packs/adversaries/adversary_Acid_Burrower_89yAh30vaNQOALlz.json
@@ -40,7 +40,8 @@
     "experiences": {
       "pe7OIoJsqlpMXEvs": {
         "name": "Tremor Sense",
-        "value": 2
+        "value": 2,
+        "description": ""
       }
     },
     "bonuses": {
@@ -148,7 +149,8 @@
       "source": "Daggerheart SRD",
       "page": 75,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "ownership": {
diff --git a/src/packs/adversaries/adversary_Adult_Flickerfly_G7jiltRjgvVhZewm.json b/src/packs/adversaries/adversary_Adult_Flickerfly_G7jiltRjgvVhZewm.json
index 3d1404a7..be14ae49 100644
--- a/src/packs/adversaries/adversary_Adult_Flickerfly_G7jiltRjgvVhZewm.json
+++ b/src/packs/adversaries/adversary_Adult_Flickerfly_G7jiltRjgvVhZewm.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 91,
       "artist": ""
-    }
+    },
+    "size": "gargantuan"
   },
   "flags": {},
   "_id": "G7jiltRjgvVhZewm",
diff --git a/src/packs/adversaries/adversary_Apprentice_Assassin_vNIbYQ4YSzNf0WPE.json b/src/packs/adversaries/adversary_Apprentice_Assassin_vNIbYQ4YSzNf0WPE.json
index fbf53d80..41bd6fca 100644
--- a/src/packs/adversaries/adversary_Apprentice_Assassin_vNIbYQ4YSzNf0WPE.json
+++ b/src/packs/adversaries/adversary_Apprentice_Assassin_vNIbYQ4YSzNf0WPE.json
@@ -110,7 +110,8 @@
       "source": "Daggerheart SRD",
       "page": 84,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "vNIbYQ4YSzNf0WPE",
diff --git a/src/packs/adversaries/adversary_Arch_Necromancer_WPEOIGfclNJxWb87.json b/src/packs/adversaries/adversary_Arch_Necromancer_WPEOIGfclNJxWb87.json
index 2962b84c..d2fb5183 100644
--- a/src/packs/adversaries/adversary_Arch_Necromancer_WPEOIGfclNJxWb87.json
+++ b/src/packs/adversaries/adversary_Arch_Necromancer_WPEOIGfclNJxWb87.json
@@ -122,7 +122,8 @@
       "source": "Daggerheart SRD",
       "page": 97,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "WPEOIGfclNJxWb87",
diff --git a/src/packs/adversaries/adversary_Archer_Guard_JRhrrEg5UroURiAD.json b/src/packs/adversaries/adversary_Archer_Guard_JRhrrEg5UroURiAD.json
index bfdee207..034905aa 100644
--- a/src/packs/adversaries/adversary_Archer_Guard_JRhrrEg5UroURiAD.json
+++ b/src/packs/adversaries/adversary_Archer_Guard_JRhrrEg5UroURiAD.json
@@ -39,7 +39,8 @@
     "experiences": {
       "Gtr9I2G39GcXT2Si": {
         "name": "Local Knowledge",
-        "value": 3
+        "value": 3,
+        "description": ""
       }
     },
     "bonuses": {
@@ -116,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 77,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "JRhrrEg5UroURiAD",
diff --git a/src/packs/adversaries/adversary_Archer_Squadron_0ts6CGd93lLqGZI5.json b/src/packs/adversaries/adversary_Archer_Squadron_0ts6CGd93lLqGZI5.json
index 88d63721..1b2c8cad 100644
--- a/src/packs/adversaries/adversary_Archer_Squadron_0ts6CGd93lLqGZI5.json
+++ b/src/packs/adversaries/adversary_Archer_Squadron_0ts6CGd93lLqGZI5.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 84,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "0ts6CGd93lLqGZI5",
diff --git a/src/packs/adversaries/adversary_Assassin_Poisoner_h5RuhzGL17dW5FBT.json b/src/packs/adversaries/adversary_Assassin_Poisoner_h5RuhzGL17dW5FBT.json
index b962fe78..cae27b60 100644
--- a/src/packs/adversaries/adversary_Assassin_Poisoner_h5RuhzGL17dW5FBT.json
+++ b/src/packs/adversaries/adversary_Assassin_Poisoner_h5RuhzGL17dW5FBT.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 84,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "h5RuhzGL17dW5FBT",
diff --git a/src/packs/adversaries/adversary_Battle_Box_dgH3fW9FTYLaIDvS.json b/src/packs/adversaries/adversary_Battle_Box_dgH3fW9FTYLaIDvS.json
index b172b646..14b5c0f3 100644
--- a/src/packs/adversaries/adversary_Battle_Box_dgH3fW9FTYLaIDvS.json
+++ b/src/packs/adversaries/adversary_Battle_Box_dgH3fW9FTYLaIDvS.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 85,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "_id": "dgH3fW9FTYLaIDvS",
diff --git a/src/packs/adversaries/adversary_Bear_71qKDLKO3CsrNkdy.json b/src/packs/adversaries/adversary_Bear_71qKDLKO3CsrNkdy.json
index f804c06e..2e4da586 100644
--- a/src/packs/adversaries/adversary_Bear_71qKDLKO3CsrNkdy.json
+++ b/src/packs/adversaries/adversary_Bear_71qKDLKO3CsrNkdy.json
@@ -122,7 +122,8 @@
       "source": "Daggerheart SRD",
       "page": 75,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "_id": "71qKDLKO3CsrNkdy",
diff --git a/src/packs/adversaries/adversary_Bladed_Guard_B4LZcGuBAHzyVdzy.json b/src/packs/adversaries/adversary_Bladed_Guard_B4LZcGuBAHzyVdzy.json
index ecc547f8..f4227a91 100644
--- a/src/packs/adversaries/adversary_Bladed_Guard_B4LZcGuBAHzyVdzy.json
+++ b/src/packs/adversaries/adversary_Bladed_Guard_B4LZcGuBAHzyVdzy.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 77,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "B4LZcGuBAHzyVdzy",
diff --git a/src/packs/adversaries/adversary_Brawny_Zombie_2UeZ0tEe7AzgSJNd.json b/src/packs/adversaries/adversary_Brawny_Zombie_2UeZ0tEe7AzgSJNd.json
index 96e00139..d522e737 100644
--- a/src/packs/adversaries/adversary_Brawny_Zombie_2UeZ0tEe7AzgSJNd.json
+++ b/src/packs/adversaries/adversary_Brawny_Zombie_2UeZ0tEe7AzgSJNd.json
@@ -120,7 +120,8 @@
       "source": "Daggerheart SRD",
       "page": 83,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "2UeZ0tEe7AzgSJNd",
diff --git a/src/packs/adversaries/adversary_Cave_Ogre_8Zkqk1jU09nKL2fy.json b/src/packs/adversaries/adversary_Cave_Ogre_8Zkqk1jU09nKL2fy.json
index 91ba0045..a85d9bf2 100644
--- a/src/packs/adversaries/adversary_Cave_Ogre_8Zkqk1jU09nKL2fy.json
+++ b/src/packs/adversaries/adversary_Cave_Ogre_8Zkqk1jU09nKL2fy.json
@@ -118,7 +118,8 @@
       "source": "Daggerheart SRD",
       "page": 75,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "_id": "8Zkqk1jU09nKL2fy",
diff --git a/src/packs/adversaries/adversary_Chaos_Skull_jDmHqGvzg5wjgmxE.json b/src/packs/adversaries/adversary_Chaos_Skull_jDmHqGvzg5wjgmxE.json
index cf2be503..fabb0a14 100644
--- a/src/packs/adversaries/adversary_Chaos_Skull_jDmHqGvzg5wjgmxE.json
+++ b/src/packs/adversaries/adversary_Chaos_Skull_jDmHqGvzg5wjgmxE.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 85,
       "artist": ""
-    }
+    },
+    "size": "tiny"
   },
   "flags": {},
   "_id": "jDmHqGvzg5wjgmxE",
diff --git a/src/packs/adversaries/adversary_Conscript_99TqczuQipBmaB8i.json b/src/packs/adversaries/adversary_Conscript_99TqczuQipBmaB8i.json
index d79aed6c..9503a299 100644
--- a/src/packs/adversaries/adversary_Conscript_99TqczuQipBmaB8i.json
+++ b/src/packs/adversaries/adversary_Conscript_99TqczuQipBmaB8i.json
@@ -104,7 +104,8 @@
       "source": "Daggerheart SRD",
       "page": 85,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "99TqczuQipBmaB8i",
diff --git a/src/packs/adversaries/adversary_Construct_uOP5oT9QzXPlnf3p.json b/src/packs/adversaries/adversary_Construct_uOP5oT9QzXPlnf3p.json
index 964b1354..428e2def 100644
--- a/src/packs/adversaries/adversary_Construct_uOP5oT9QzXPlnf3p.json
+++ b/src/packs/adversaries/adversary_Construct_uOP5oT9QzXPlnf3p.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 75,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "uOP5oT9QzXPlnf3p",
diff --git a/src/packs/adversaries/adversary_Courtesan_ZxWaWPdzFIUPNC62.json b/src/packs/adversaries/adversary_Courtesan_ZxWaWPdzFIUPNC62.json
index 571d8cf1..470dc140 100644
--- a/src/packs/adversaries/adversary_Courtesan_ZxWaWPdzFIUPNC62.json
+++ b/src/packs/adversaries/adversary_Courtesan_ZxWaWPdzFIUPNC62.json
@@ -122,7 +122,8 @@
       "source": "Daggerheart SRD",
       "page": 85,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "ZxWaWPdzFIUPNC62",
diff --git a/src/packs/adversaries/adversary_Courtier_CBBuEXAlLKFMJdjg.json b/src/packs/adversaries/adversary_Courtier_CBBuEXAlLKFMJdjg.json
index c22a8130..eabd803e 100644
--- a/src/packs/adversaries/adversary_Courtier_CBBuEXAlLKFMJdjg.json
+++ b/src/packs/adversaries/adversary_Courtier_CBBuEXAlLKFMJdjg.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 76,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "CBBuEXAlLKFMJdjg",
diff --git a/src/packs/adversaries/adversary_Cult_Adept_0NxCSugvKQ4W8OYZ.json b/src/packs/adversaries/adversary_Cult_Adept_0NxCSugvKQ4W8OYZ.json
index 8e4f477e..587d980c 100644
--- a/src/packs/adversaries/adversary_Cult_Adept_0NxCSugvKQ4W8OYZ.json
+++ b/src/packs/adversaries/adversary_Cult_Adept_0NxCSugvKQ4W8OYZ.json
@@ -122,7 +122,8 @@
       "source": "Daggerheart SRD",
       "page": 85,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "0NxCSugvKQ4W8OYZ",
diff --git a/src/packs/adversaries/adversary_Cult_Fang_tyBOpLfigAhI9bU3.json b/src/packs/adversaries/adversary_Cult_Fang_tyBOpLfigAhI9bU3.json
index 5b167356..2dfb331d 100644
--- a/src/packs/adversaries/adversary_Cult_Fang_tyBOpLfigAhI9bU3.json
+++ b/src/packs/adversaries/adversary_Cult_Fang_tyBOpLfigAhI9bU3.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 86,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "tyBOpLfigAhI9bU3",
diff --git a/src/packs/adversaries/adversary_Cult_Initiate_zx99sOGTXicP4SSD.json b/src/packs/adversaries/adversary_Cult_Initiate_zx99sOGTXicP4SSD.json
index 0aa5c326..6078e25c 100644
--- a/src/packs/adversaries/adversary_Cult_Initiate_zx99sOGTXicP4SSD.json
+++ b/src/packs/adversaries/adversary_Cult_Initiate_zx99sOGTXicP4SSD.json
@@ -104,7 +104,8 @@
       "source": "Daggerheart SRD",
       "page": 86,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "zx99sOGTXicP4SSD",
diff --git a/src/packs/adversaries/adversary_Deeproot_Defender_9x2xY9zwc3xzbXo5.json b/src/packs/adversaries/adversary_Deeproot_Defender_9x2xY9zwc3xzbXo5.json
index 19d0fd4d..4fab7cb6 100644
--- a/src/packs/adversaries/adversary_Deeproot_Defender_9x2xY9zwc3xzbXo5.json
+++ b/src/packs/adversaries/adversary_Deeproot_Defender_9x2xY9zwc3xzbXo5.json
@@ -116,7 +116,8 @@
       "source": "Daggerheart SRD",
       "page": 76,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "9x2xY9zwc3xzbXo5",
diff --git a/src/packs/adversaries/adversary_Demon_of_Avarice_pnyjIGxxvurcWmTv.json b/src/packs/adversaries/adversary_Demon_of_Avarice_pnyjIGxxvurcWmTv.json
index fa925b38..38b5a23c 100644
--- a/src/packs/adversaries/adversary_Demon_of_Avarice_pnyjIGxxvurcWmTv.json
+++ b/src/packs/adversaries/adversary_Demon_of_Avarice_pnyjIGxxvurcWmTv.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 91,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "pnyjIGxxvurcWmTv",
diff --git a/src/packs/adversaries/adversary_Demon_of_Despair_kE4dfhqmIQpNd44e.json b/src/packs/adversaries/adversary_Demon_of_Despair_kE4dfhqmIQpNd44e.json
index cc792029..c9e9579a 100644
--- a/src/packs/adversaries/adversary_Demon_of_Despair_kE4dfhqmIQpNd44e.json
+++ b/src/packs/adversaries/adversary_Demon_of_Despair_kE4dfhqmIQpNd44e.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 92,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "kE4dfhqmIQpNd44e",
diff --git a/src/packs/adversaries/adversary_Demon_of_Hubris_2VN3BftageoTTIzu.json b/src/packs/adversaries/adversary_Demon_of_Hubris_2VN3BftageoTTIzu.json
index 04f6a778..be8f3eab 100644
--- a/src/packs/adversaries/adversary_Demon_of_Hubris_2VN3BftageoTTIzu.json
+++ b/src/packs/adversaries/adversary_Demon_of_Hubris_2VN3BftageoTTIzu.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 92,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "2VN3BftageoTTIzu",
diff --git a/src/packs/adversaries/adversary_Demon_of_Jealousy_SxSOkM4bcVOFyjbo.json b/src/packs/adversaries/adversary_Demon_of_Jealousy_SxSOkM4bcVOFyjbo.json
index e79eef29..7e3b5c6d 100644
--- a/src/packs/adversaries/adversary_Demon_of_Jealousy_SxSOkM4bcVOFyjbo.json
+++ b/src/packs/adversaries/adversary_Demon_of_Jealousy_SxSOkM4bcVOFyjbo.json
@@ -118,7 +118,8 @@
       "source": "Daggerheart SRD",
       "page": 92,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "SxSOkM4bcVOFyjbo",
diff --git a/src/packs/adversaries/adversary_Demon_of_Wrath_5lphJAgzoqZI3VoG.json b/src/packs/adversaries/adversary_Demon_of_Wrath_5lphJAgzoqZI3VoG.json
index cfe301f5..538c0d0a 100644
--- a/src/packs/adversaries/adversary_Demon_of_Wrath_5lphJAgzoqZI3VoG.json
+++ b/src/packs/adversaries/adversary_Demon_of_Wrath_5lphJAgzoqZI3VoG.json
@@ -118,7 +118,8 @@
       "source": "Daggerheart SRD",
       "page": 92,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "_id": "5lphJAgzoqZI3VoG",
diff --git a/src/packs/adversaries/adversary_Demonic_Hound_Pack_NoRZ1PqB8N5wcIw0.json b/src/packs/adversaries/adversary_Demonic_Hound_Pack_NoRZ1PqB8N5wcIw0.json
index d407949e..cf982cda 100644
--- a/src/packs/adversaries/adversary_Demonic_Hound_Pack_NoRZ1PqB8N5wcIw0.json
+++ b/src/packs/adversaries/adversary_Demonic_Hound_Pack_NoRZ1PqB8N5wcIw0.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 86,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "_id": "NoRZ1PqB8N5wcIw0",
diff --git a/src/packs/adversaries/adversary_Dire_Bat_tBWHW00epmMnkawe.json b/src/packs/adversaries/adversary_Dire_Bat_tBWHW00epmMnkawe.json
index 9c367879..91f4d795 100644
--- a/src/packs/adversaries/adversary_Dire_Bat_tBWHW00epmMnkawe.json
+++ b/src/packs/adversaries/adversary_Dire_Bat_tBWHW00epmMnkawe.json
@@ -116,7 +116,8 @@
       "source": "Daggerheart SRD",
       "page": 93,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "tBWHW00epmMnkawe",
diff --git a/src/packs/adversaries/adversary_Dire_Wolf_wNzeuQLfLUMvgHlQ.json b/src/packs/adversaries/adversary_Dire_Wolf_wNzeuQLfLUMvgHlQ.json
index f40c2310..5028e88c 100644
--- a/src/packs/adversaries/adversary_Dire_Wolf_wNzeuQLfLUMvgHlQ.json
+++ b/src/packs/adversaries/adversary_Dire_Wolf_wNzeuQLfLUMvgHlQ.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 76,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "wNzeuQLfLUMvgHlQ",
diff --git a/src/packs/adversaries/adversary_Dryad_wR7cFKrHvRzbzhBT.json b/src/packs/adversaries/adversary_Dryad_wR7cFKrHvRzbzhBT.json
index 0bd8939e..2b1596da 100644
--- a/src/packs/adversaries/adversary_Dryad_wR7cFKrHvRzbzhBT.json
+++ b/src/packs/adversaries/adversary_Dryad_wR7cFKrHvRzbzhBT.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 93,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "wR7cFKrHvRzbzhBT",
diff --git a/src/packs/adversaries/adversary_Electric_Eels_TLzY1nDw0Bu9Ud40.json b/src/packs/adversaries/adversary_Electric_Eels_TLzY1nDw0Bu9Ud40.json
index 0354d820..73074ca1 100644
--- a/src/packs/adversaries/adversary_Electric_Eels_TLzY1nDw0Bu9Ud40.json
+++ b/src/packs/adversaries/adversary_Electric_Eels_TLzY1nDw0Bu9Ud40.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 86,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "TLzY1nDw0Bu9Ud40",
diff --git a/src/packs/adversaries/adversary_Elemental_Spark_P7h54ZePFPHpYwvB.json b/src/packs/adversaries/adversary_Elemental_Spark_P7h54ZePFPHpYwvB.json
index 9713e7ba..1a265528 100644
--- a/src/packs/adversaries/adversary_Elemental_Spark_P7h54ZePFPHpYwvB.json
+++ b/src/packs/adversaries/adversary_Elemental_Spark_P7h54ZePFPHpYwvB.json
@@ -104,7 +104,8 @@
       "source": "Daggerheart SRD",
       "page": 93,
       "artist": ""
-    }
+    },
+    "size": "tiny"
   },
   "flags": {},
   "_id": "P7h54ZePFPHpYwvB",
diff --git a/src/packs/adversaries/adversary_Elite_Soldier_bfhVWMBUh61b9J6n.json b/src/packs/adversaries/adversary_Elite_Soldier_bfhVWMBUh61b9J6n.json
index 18dc586b..cc98f31d 100644
--- a/src/packs/adversaries/adversary_Elite_Soldier_bfhVWMBUh61b9J6n.json
+++ b/src/packs/adversaries/adversary_Elite_Soldier_bfhVWMBUh61b9J6n.json
@@ -143,7 +143,8 @@
       "source": "Daggerheart SRD",
       "page": 86,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "ownership": {
diff --git a/src/packs/adversaries/adversary_Failed_Experiment_ChwwVqowFw8hJQwT.json b/src/packs/adversaries/adversary_Failed_Experiment_ChwwVqowFw8hJQwT.json
index 7e97c5b1..89c922f4 100644
--- a/src/packs/adversaries/adversary_Failed_Experiment_ChwwVqowFw8hJQwT.json
+++ b/src/packs/adversaries/adversary_Failed_Experiment_ChwwVqowFw8hJQwT.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 86,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "ChwwVqowFw8hJQwT",
diff --git a/src/packs/adversaries/adversary_Fallen_Shock_Troop_OsLG2BjaEdTZUJU9.json b/src/packs/adversaries/adversary_Fallen_Shock_Troop_OsLG2BjaEdTZUJU9.json
index b8b054c8..9833a495 100644
--- a/src/packs/adversaries/adversary_Fallen_Shock_Troop_OsLG2BjaEdTZUJU9.json
+++ b/src/packs/adversaries/adversary_Fallen_Shock_Troop_OsLG2BjaEdTZUJU9.json
@@ -104,7 +104,8 @@
       "source": "Daggerheart SRD",
       "page": 97,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "OsLG2BjaEdTZUJU9",
diff --git a/src/packs/adversaries/adversary_Fallen_Sorcerer_PELRry1vqjBzSAlr.json b/src/packs/adversaries/adversary_Fallen_Sorcerer_PELRry1vqjBzSAlr.json
index 8b690bfd..9c63042e 100644
--- a/src/packs/adversaries/adversary_Fallen_Sorcerer_PELRry1vqjBzSAlr.json
+++ b/src/packs/adversaries/adversary_Fallen_Sorcerer_PELRry1vqjBzSAlr.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 97,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "PELRry1vqjBzSAlr",
diff --git a/src/packs/adversaries/adversary_Fallen_Warlord__Realm_Breaker_hxZ0sgoFJubh5aj6.json b/src/packs/adversaries/adversary_Fallen_Warlord__Realm_Breaker_hxZ0sgoFJubh5aj6.json
index 8d75dd9e..8b0d912d 100644
--- a/src/packs/adversaries/adversary_Fallen_Warlord__Realm_Breaker_hxZ0sgoFJubh5aj6.json
+++ b/src/packs/adversaries/adversary_Fallen_Warlord__Realm_Breaker_hxZ0sgoFJubh5aj6.json
@@ -160,7 +160,8 @@
       "source": "Daggerheart SRD",
       "page": 97,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "prototypeToken": {
     "name": "Fallen Warlord: Realm Breaker",
diff --git a/src/packs/adversaries/adversary_Fallen_Warlord__Undefeated_Champion_RXkZTwBRi4dJ3JE5.json b/src/packs/adversaries/adversary_Fallen_Warlord__Undefeated_Champion_RXkZTwBRi4dJ3JE5.json
index 061abed8..bc5ceee1 100644
--- a/src/packs/adversaries/adversary_Fallen_Warlord__Undefeated_Champion_RXkZTwBRi4dJ3JE5.json
+++ b/src/packs/adversaries/adversary_Fallen_Warlord__Undefeated_Champion_RXkZTwBRi4dJ3JE5.json
@@ -161,7 +161,8 @@
       "source": "Daggerheart SRD",
       "page": 98,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "prototypeToken": {
     "name": "Fallen Warlord: Undefeated Champion",
diff --git a/src/packs/adversaries/adversary_Giant_Beastmaster_8VZIgU12cB3cvlyH.json b/src/packs/adversaries/adversary_Giant_Beastmaster_8VZIgU12cB3cvlyH.json
index e82d30d8..52e27c88 100644
--- a/src/packs/adversaries/adversary_Giant_Beastmaster_8VZIgU12cB3cvlyH.json
+++ b/src/packs/adversaries/adversary_Giant_Beastmaster_8VZIgU12cB3cvlyH.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 87,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "_id": "8VZIgU12cB3cvlyH",
diff --git a/src/packs/adversaries/adversary_Giant_Brawler_YnObCleGjPT7yqEc.json b/src/packs/adversaries/adversary_Giant_Brawler_YnObCleGjPT7yqEc.json
index a51abc03..def13ed1 100644
--- a/src/packs/adversaries/adversary_Giant_Brawler_YnObCleGjPT7yqEc.json
+++ b/src/packs/adversaries/adversary_Giant_Brawler_YnObCleGjPT7yqEc.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 87,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "_id": "YnObCleGjPT7yqEc",
diff --git a/src/packs/adversaries/adversary_Giant_Eagle_OMQ0v6PE8s1mSU0K.json b/src/packs/adversaries/adversary_Giant_Eagle_OMQ0v6PE8s1mSU0K.json
index dc21e5aa..3b877a09 100644
--- a/src/packs/adversaries/adversary_Giant_Eagle_OMQ0v6PE8s1mSU0K.json
+++ b/src/packs/adversaries/adversary_Giant_Eagle_OMQ0v6PE8s1mSU0K.json
@@ -143,7 +143,8 @@
       "source": "Daggerheart SRD",
       "page": 87,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "ownership": {
diff --git a/src/packs/adversaries/adversary_Giant_Mosquitoes_IIWV4ysJPFPnTP7W.json b/src/packs/adversaries/adversary_Giant_Mosquitoes_IIWV4ysJPFPnTP7W.json
index 0db2613f..842f4adf 100644
--- a/src/packs/adversaries/adversary_Giant_Mosquitoes_IIWV4ysJPFPnTP7W.json
+++ b/src/packs/adversaries/adversary_Giant_Mosquitoes_IIWV4ysJPFPnTP7W.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 76,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "IIWV4ysJPFPnTP7W",
diff --git a/src/packs/adversaries/adversary_Giant_Rat_4PfLnaCrOcMdb4dK.json b/src/packs/adversaries/adversary_Giant_Rat_4PfLnaCrOcMdb4dK.json
index 7da2eabd..26b5b232 100644
--- a/src/packs/adversaries/adversary_Giant_Rat_4PfLnaCrOcMdb4dK.json
+++ b/src/packs/adversaries/adversary_Giant_Rat_4PfLnaCrOcMdb4dK.json
@@ -110,7 +110,8 @@
       "source": "Daggerheart SRD",
       "page": 76,
       "artist": ""
-    }
+    },
+    "size": "small"
   },
   "flags": {},
   "_id": "4PfLnaCrOcMdb4dK",
diff --git a/src/packs/adversaries/adversary_Giant_Recruit_5s8wSvpyC5rxY5aD.json b/src/packs/adversaries/adversary_Giant_Recruit_5s8wSvpyC5rxY5aD.json
index 0ef9eb18..f926bd4b 100644
--- a/src/packs/adversaries/adversary_Giant_Recruit_5s8wSvpyC5rxY5aD.json
+++ b/src/packs/adversaries/adversary_Giant_Recruit_5s8wSvpyC5rxY5aD.json
@@ -104,7 +104,8 @@
       "source": "Daggerheart SRD",
       "page": 87,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "_id": "5s8wSvpyC5rxY5aD",
diff --git a/src/packs/adversaries/adversary_Giant_Scorpion_fmfntuJ8mHRCAktP.json b/src/packs/adversaries/adversary_Giant_Scorpion_fmfntuJ8mHRCAktP.json
index b65a27ba..cebcaced 100644
--- a/src/packs/adversaries/adversary_Giant_Scorpion_fmfntuJ8mHRCAktP.json
+++ b/src/packs/adversaries/adversary_Giant_Scorpion_fmfntuJ8mHRCAktP.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 76,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "fmfntuJ8mHRCAktP",
diff --git a/src/packs/adversaries/adversary_Glass_Snake_8KWVLWXFhlY2kYx0.json b/src/packs/adversaries/adversary_Glass_Snake_8KWVLWXFhlY2kYx0.json
index 67d9a7d7..b730dc57 100644
--- a/src/packs/adversaries/adversary_Glass_Snake_8KWVLWXFhlY2kYx0.json
+++ b/src/packs/adversaries/adversary_Glass_Snake_8KWVLWXFhlY2kYx0.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 77,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "_id": "8KWVLWXFhlY2kYx0",
diff --git a/src/packs/adversaries/adversary_Gorgon_8mJYMpbLTb8qIOrr.json b/src/packs/adversaries/adversary_Gorgon_8mJYMpbLTb8qIOrr.json
index 98080be6..b8e1012b 100644
--- a/src/packs/adversaries/adversary_Gorgon_8mJYMpbLTb8qIOrr.json
+++ b/src/packs/adversaries/adversary_Gorgon_8mJYMpbLTb8qIOrr.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 88,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "8mJYMpbLTb8qIOrr",
diff --git a/src/packs/adversaries/adversary_Greater_Earth_Elemental_dsfB3YhoL5SudvS2.json b/src/packs/adversaries/adversary_Greater_Earth_Elemental_dsfB3YhoL5SudvS2.json
index e8bc6601..ebb104f6 100644
--- a/src/packs/adversaries/adversary_Greater_Earth_Elemental_dsfB3YhoL5SudvS2.json
+++ b/src/packs/adversaries/adversary_Greater_Earth_Elemental_dsfB3YhoL5SudvS2.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 93,
       "artist": ""
-    }
+    },
+    "size": "gargantuan"
   },
   "flags": {},
   "_id": "dsfB3YhoL5SudvS2",
diff --git a/src/packs/adversaries/adversary_Greater_Water_Elemental_xIICT6tEdnA7dKDV.json b/src/packs/adversaries/adversary_Greater_Water_Elemental_xIICT6tEdnA7dKDV.json
index 73b702fb..1ce86201 100644
--- a/src/packs/adversaries/adversary_Greater_Water_Elemental_xIICT6tEdnA7dKDV.json
+++ b/src/packs/adversaries/adversary_Greater_Water_Elemental_xIICT6tEdnA7dKDV.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 93,
       "artist": ""
-    }
+    },
+    "size": "gargantuan"
   },
   "flags": {},
   "_id": "xIICT6tEdnA7dKDV",
diff --git a/src/packs/adversaries/adversary_Green_Ooze_SHXedd9zZPVfUgUa.json b/src/packs/adversaries/adversary_Green_Ooze_SHXedd9zZPVfUgUa.json
index 5746f57b..eaaecf2f 100644
--- a/src/packs/adversaries/adversary_Green_Ooze_SHXedd9zZPVfUgUa.json
+++ b/src/packs/adversaries/adversary_Green_Ooze_SHXedd9zZPVfUgUa.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 80,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "SHXedd9zZPVfUgUa",
diff --git a/src/packs/adversaries/adversary_Hallowed_Archer_kabueAo6BALApWqp.json b/src/packs/adversaries/adversary_Hallowed_Archer_kabueAo6BALApWqp.json
index 6ad8d177..e9a1a19f 100644
--- a/src/packs/adversaries/adversary_Hallowed_Archer_kabueAo6BALApWqp.json
+++ b/src/packs/adversaries/adversary_Hallowed_Archer_kabueAo6BALApWqp.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 98,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "kabueAo6BALApWqp",
diff --git a/src/packs/adversaries/adversary_Hallowed_Soldier_VENwg7xEFcYObjmT.json b/src/packs/adversaries/adversary_Hallowed_Soldier_VENwg7xEFcYObjmT.json
index 5a1ccc65..f84daf3c 100644
--- a/src/packs/adversaries/adversary_Hallowed_Soldier_VENwg7xEFcYObjmT.json
+++ b/src/packs/adversaries/adversary_Hallowed_Soldier_VENwg7xEFcYObjmT.json
@@ -104,7 +104,8 @@
       "source": "Daggerheart SRD",
       "page": 98,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "VENwg7xEFcYObjmT",
diff --git a/src/packs/adversaries/adversary_Harrier_uRtghKE9mHlII4rs.json b/src/packs/adversaries/adversary_Harrier_uRtghKE9mHlII4rs.json
index d5ce14ff..105c5afd 100644
--- a/src/packs/adversaries/adversary_Harrier_uRtghKE9mHlII4rs.json
+++ b/src/packs/adversaries/adversary_Harrier_uRtghKE9mHlII4rs.json
@@ -116,7 +116,8 @@
       "source": "Daggerheart SRD",
       "page": 77,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "uRtghKE9mHlII4rs",
diff --git a/src/packs/adversaries/adversary_Head_Guard_mK3A5FTx6k8iPU3F.json b/src/packs/adversaries/adversary_Head_Guard_mK3A5FTx6k8iPU3F.json
index d9f6e8b9..48ff14a8 100644
--- a/src/packs/adversaries/adversary_Head_Guard_mK3A5FTx6k8iPU3F.json
+++ b/src/packs/adversaries/adversary_Head_Guard_mK3A5FTx6k8iPU3F.json
@@ -122,7 +122,8 @@
       "source": "Daggerheart SRD",
       "page": 77,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "mK3A5FTx6k8iPU3F",
diff --git a/src/packs/adversaries/adversary_Head_Vampire_i2UNbRvgyoSs07M6.json b/src/packs/adversaries/adversary_Head_Vampire_i2UNbRvgyoSs07M6.json
index d80504a7..d010ee34 100644
--- a/src/packs/adversaries/adversary_Head_Vampire_i2UNbRvgyoSs07M6.json
+++ b/src/packs/adversaries/adversary_Head_Vampire_i2UNbRvgyoSs07M6.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 95,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "i2UNbRvgyoSs07M6",
diff --git a/src/packs/adversaries/adversary_High_Seraph_r1mbfSSwKWdcFdAU.json b/src/packs/adversaries/adversary_High_Seraph_r1mbfSSwKWdcFdAU.json
index 58b26f24..a2734e0d 100644
--- a/src/packs/adversaries/adversary_High_Seraph_r1mbfSSwKWdcFdAU.json
+++ b/src/packs/adversaries/adversary_High_Seraph_r1mbfSSwKWdcFdAU.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 98,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "r1mbfSSwKWdcFdAU",
diff --git a/src/packs/adversaries/adversary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json b/src/packs/adversaries/adversary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json
index d291f805..6e5c45f9 100644
--- a/src/packs/adversaries/adversary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json
+++ b/src/packs/adversaries/adversary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 94,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "_id": "6hbqmxDXFOzZJDk4",
diff --git a/src/packs/adversaries/adversary_Hydra_MI126iMOOobQ1Obn.json b/src/packs/adversaries/adversary_Hydra_MI126iMOOobQ1Obn.json
index 3c39550c..592d0da1 100644
--- a/src/packs/adversaries/adversary_Hydra_MI126iMOOobQ1Obn.json
+++ b/src/packs/adversaries/adversary_Hydra_MI126iMOOobQ1Obn.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 94,
       "artist": ""
-    }
+    },
+    "size": "huge"
   },
   "flags": {},
   "_id": "MI126iMOOobQ1Obn",
diff --git a/src/packs/adversaries/adversary_Jagged_Knife_Bandit_5Lh1T0zaT8Pkr2U2.json b/src/packs/adversaries/adversary_Jagged_Knife_Bandit_5Lh1T0zaT8Pkr2U2.json
index 8828c612..7a95c097 100644
--- a/src/packs/adversaries/adversary_Jagged_Knife_Bandit_5Lh1T0zaT8Pkr2U2.json
+++ b/src/packs/adversaries/adversary_Jagged_Knife_Bandit_5Lh1T0zaT8Pkr2U2.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 77,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "5Lh1T0zaT8Pkr2U2",
diff --git a/src/packs/adversaries/adversary_Jagged_Knife_Hexer_MbBPIOxaxXYNApXz.json b/src/packs/adversaries/adversary_Jagged_Knife_Hexer_MbBPIOxaxXYNApXz.json
index 26d83e78..200ed9b1 100644
--- a/src/packs/adversaries/adversary_Jagged_Knife_Hexer_MbBPIOxaxXYNApXz.json
+++ b/src/packs/adversaries/adversary_Jagged_Knife_Hexer_MbBPIOxaxXYNApXz.json
@@ -116,7 +116,8 @@
       "source": "Daggerheart SRD",
       "page": 78,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "MbBPIOxaxXYNApXz",
diff --git a/src/packs/adversaries/adversary_Jagged_Knife_Kneebreaker_CBKixLH3yhivZZuL.json b/src/packs/adversaries/adversary_Jagged_Knife_Kneebreaker_CBKixLH3yhivZZuL.json
index 698ef485..48edab51 100644
--- a/src/packs/adversaries/adversary_Jagged_Knife_Kneebreaker_CBKixLH3yhivZZuL.json
+++ b/src/packs/adversaries/adversary_Jagged_Knife_Kneebreaker_CBKixLH3yhivZZuL.json
@@ -122,7 +122,8 @@
       "source": "Daggerheart SRD",
       "page": 78,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "CBKixLH3yhivZZuL",
diff --git a/src/packs/adversaries/adversary_Jagged_Knife_Lackey_C0OMQqV7pN6t7ouR.json b/src/packs/adversaries/adversary_Jagged_Knife_Lackey_C0OMQqV7pN6t7ouR.json
index 668852a8..65c41639 100644
--- a/src/packs/adversaries/adversary_Jagged_Knife_Lackey_C0OMQqV7pN6t7ouR.json
+++ b/src/packs/adversaries/adversary_Jagged_Knife_Lackey_C0OMQqV7pN6t7ouR.json
@@ -110,7 +110,8 @@
       "source": "Daggerheart SRD",
       "page": 78,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "C0OMQqV7pN6t7ouR",
diff --git a/src/packs/adversaries/adversary_Jagged_Knife_Lieutenant_aTljstqteGoLpCBq.json b/src/packs/adversaries/adversary_Jagged_Knife_Lieutenant_aTljstqteGoLpCBq.json
index 6f4b54a5..004c740a 100644
--- a/src/packs/adversaries/adversary_Jagged_Knife_Lieutenant_aTljstqteGoLpCBq.json
+++ b/src/packs/adversaries/adversary_Jagged_Knife_Lieutenant_aTljstqteGoLpCBq.json
@@ -116,7 +116,8 @@
       "source": "Daggerheart SRD",
       "page": 78,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "aTljstqteGoLpCBq",
diff --git a/src/packs/adversaries/adversary_Jagged_Knife_Shadow_XF4tYTq9nPJAy2ox.json b/src/packs/adversaries/adversary_Jagged_Knife_Shadow_XF4tYTq9nPJAy2ox.json
index ad53f212..96c65c8c 100644
--- a/src/packs/adversaries/adversary_Jagged_Knife_Shadow_XF4tYTq9nPJAy2ox.json
+++ b/src/packs/adversaries/adversary_Jagged_Knife_Shadow_XF4tYTq9nPJAy2ox.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 78,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "XF4tYTq9nPJAy2ox",
diff --git a/src/packs/adversaries/adversary_Jagged_Knife_Sniper_1zuyof1XuIfi3aMG.json b/src/packs/adversaries/adversary_Jagged_Knife_Sniper_1zuyof1XuIfi3aMG.json
index 968e227a..1ef7070c 100644
--- a/src/packs/adversaries/adversary_Jagged_Knife_Sniper_1zuyof1XuIfi3aMG.json
+++ b/src/packs/adversaries/adversary_Jagged_Knife_Sniper_1zuyof1XuIfi3aMG.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 78,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "1zuyof1XuIfi3aMG",
diff --git a/src/packs/adversaries/adversary_Juvenile_Flickerfly_MYXmTx2FHcIjdfYZ.json b/src/packs/adversaries/adversary_Juvenile_Flickerfly_MYXmTx2FHcIjdfYZ.json
index fc30a072..242bedcb 100644
--- a/src/packs/adversaries/adversary_Juvenile_Flickerfly_MYXmTx2FHcIjdfYZ.json
+++ b/src/packs/adversaries/adversary_Juvenile_Flickerfly_MYXmTx2FHcIjdfYZ.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 88,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "_id": "MYXmTx2FHcIjdfYZ",
diff --git a/src/packs/adversaries/adversary_Knight_of_the_Realm_7ai2opemrclQe3VF.json b/src/packs/adversaries/adversary_Knight_of_the_Realm_7ai2opemrclQe3VF.json
index 51e7979d..dca27ce3 100644
--- a/src/packs/adversaries/adversary_Knight_of_the_Realm_7ai2opemrclQe3VF.json
+++ b/src/packs/adversaries/adversary_Knight_of_the_Realm_7ai2opemrclQe3VF.json
@@ -127,7 +127,8 @@
       "source": "Daggerheart SRD",
       "page": 88,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "7ai2opemrclQe3VF",
diff --git a/src/packs/adversaries/adversary_Kraken_4nqv3ZwJGjnmic8j.json b/src/packs/adversaries/adversary_Kraken_4nqv3ZwJGjnmic8j.json
index 62d443c9..58169e89 100644
--- a/src/packs/adversaries/adversary_Kraken_4nqv3ZwJGjnmic8j.json
+++ b/src/packs/adversaries/adversary_Kraken_4nqv3ZwJGjnmic8j.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 99,
       "artist": ""
-    }
+    },
+    "size": "gargantuan"
   },
   "flags": {},
   "_id": "4nqv3ZwJGjnmic8j",
diff --git a/src/packs/adversaries/adversary_Masked_Thief_niBpVU7yeo5ccskE.json b/src/packs/adversaries/adversary_Masked_Thief_niBpVU7yeo5ccskE.json
index 5af8b388..500d1211 100644
--- a/src/packs/adversaries/adversary_Masked_Thief_niBpVU7yeo5ccskE.json
+++ b/src/packs/adversaries/adversary_Masked_Thief_niBpVU7yeo5ccskE.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 88,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "niBpVU7yeo5ccskE",
diff --git a/src/packs/adversaries/adversary_Master_Assassin_dNta0cUzr96xcFhf.json b/src/packs/adversaries/adversary_Master_Assassin_dNta0cUzr96xcFhf.json
index 5ac80827..f654773a 100644
--- a/src/packs/adversaries/adversary_Master_Assassin_dNta0cUzr96xcFhf.json
+++ b/src/packs/adversaries/adversary_Master_Assassin_dNta0cUzr96xcFhf.json
@@ -122,7 +122,8 @@
       "source": "Daggerheart SRD",
       "page": 84,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "dNta0cUzr96xcFhf",
diff --git a/src/packs/adversaries/adversary_Merchant_Al3w2CgjfdT3p9ma.json b/src/packs/adversaries/adversary_Merchant_Al3w2CgjfdT3p9ma.json
index 43135e6f..15197d52 100644
--- a/src/packs/adversaries/adversary_Merchant_Al3w2CgjfdT3p9ma.json
+++ b/src/packs/adversaries/adversary_Merchant_Al3w2CgjfdT3p9ma.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 79,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "Al3w2CgjfdT3p9ma",
diff --git a/src/packs/adversaries/adversary_Merchant_Baron_Vy02IhGhkJLuezu4.json b/src/packs/adversaries/adversary_Merchant_Baron_Vy02IhGhkJLuezu4.json
index 0dea7b8e..2d392f8c 100644
--- a/src/packs/adversaries/adversary_Merchant_Baron_Vy02IhGhkJLuezu4.json
+++ b/src/packs/adversaries/adversary_Merchant_Baron_Vy02IhGhkJLuezu4.json
@@ -122,7 +122,8 @@
       "source": "Daggerheart SRD",
       "page": 88,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "Vy02IhGhkJLuezu4",
diff --git a/src/packs/adversaries/adversary_Minor_Chaos_Elemental_sRn4bqerfARvhgSV.json b/src/packs/adversaries/adversary_Minor_Chaos_Elemental_sRn4bqerfARvhgSV.json
index 8d7c1888..5a9cd4c1 100644
--- a/src/packs/adversaries/adversary_Minor_Chaos_Elemental_sRn4bqerfARvhgSV.json
+++ b/src/packs/adversaries/adversary_Minor_Chaos_Elemental_sRn4bqerfARvhgSV.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 79,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "sRn4bqerfARvhgSV",
diff --git a/src/packs/adversaries/adversary_Minor_Demon_3tqCjDwJAQ7JKqMb.json b/src/packs/adversaries/adversary_Minor_Demon_3tqCjDwJAQ7JKqMb.json
index 813af3c3..9f47ce8b 100644
--- a/src/packs/adversaries/adversary_Minor_Demon_3tqCjDwJAQ7JKqMb.json
+++ b/src/packs/adversaries/adversary_Minor_Demon_3tqCjDwJAQ7JKqMb.json
@@ -110,7 +110,8 @@
       "source": "Daggerheart SRD",
       "page": 79,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "3tqCjDwJAQ7JKqMb",
diff --git a/src/packs/adversaries/adversary_Minor_Fire_Elemental_DscWkNVoHak6P4hh.json b/src/packs/adversaries/adversary_Minor_Fire_Elemental_DscWkNVoHak6P4hh.json
index f57abdd9..24f6da13 100644
--- a/src/packs/adversaries/adversary_Minor_Fire_Elemental_DscWkNVoHak6P4hh.json
+++ b/src/packs/adversaries/adversary_Minor_Fire_Elemental_DscWkNVoHak6P4hh.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 79,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "_id": "DscWkNVoHak6P4hh",
diff --git a/src/packs/adversaries/adversary_Minor_Treant_G62k4oSkhkoXEs2D.json b/src/packs/adversaries/adversary_Minor_Treant_G62k4oSkhkoXEs2D.json
index c16b2c36..e1f388cf 100644
--- a/src/packs/adversaries/adversary_Minor_Treant_G62k4oSkhkoXEs2D.json
+++ b/src/packs/adversaries/adversary_Minor_Treant_G62k4oSkhkoXEs2D.json
@@ -104,7 +104,8 @@
       "source": "Daggerheart SRD",
       "page": 80,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "G62k4oSkhkoXEs2D",
diff --git a/src/packs/adversaries/adversary_Minotaur_Wrecker_rM9qCIYeWg9I0B4l.json b/src/packs/adversaries/adversary_Minotaur_Wrecker_rM9qCIYeWg9I0B4l.json
index 9ac0caa9..15889935 100644
--- a/src/packs/adversaries/adversary_Minotaur_Wrecker_rM9qCIYeWg9I0B4l.json
+++ b/src/packs/adversaries/adversary_Minotaur_Wrecker_rM9qCIYeWg9I0B4l.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 89,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "_id": "rM9qCIYeWg9I0B4l",
diff --git a/src/packs/adversaries/adversary_Monarch_yx0vK2yfNVZKWUUi.json b/src/packs/adversaries/adversary_Monarch_yx0vK2yfNVZKWUUi.json
index 8ec7b09d..a0d7a81c 100644
--- a/src/packs/adversaries/adversary_Monarch_yx0vK2yfNVZKWUUi.json
+++ b/src/packs/adversaries/adversary_Monarch_yx0vK2yfNVZKWUUi.json
@@ -122,7 +122,8 @@
       "source": "Daggerheart SRD",
       "page": 94,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "yx0vK2yfNVZKWUUi",
diff --git a/src/packs/adversaries/adversary_Mortal_Hunter_mVV7a7KQAORoPMgZ.json b/src/packs/adversaries/adversary_Mortal_Hunter_mVV7a7KQAORoPMgZ.json
index febdc8e7..5a7b3aac 100644
--- a/src/packs/adversaries/adversary_Mortal_Hunter_mVV7a7KQAORoPMgZ.json
+++ b/src/packs/adversaries/adversary_Mortal_Hunter_mVV7a7KQAORoPMgZ.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 89,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "mVV7a7KQAORoPMgZ",
diff --git a/src/packs/adversaries/adversary_Oak_Treant_XK78QUfY8c8Go8Uv.json b/src/packs/adversaries/adversary_Oak_Treant_XK78QUfY8c8Go8Uv.json
index 977792ea..d35547bd 100644
--- a/src/packs/adversaries/adversary_Oak_Treant_XK78QUfY8c8Go8Uv.json
+++ b/src/packs/adversaries/adversary_Oak_Treant_XK78QUfY8c8Go8Uv.json
@@ -111,7 +111,8 @@
       "page": 95,
       "artist": ""
     },
-    "motivesAndTactics": "Hide in plain sight, preserve the forest, root down, swing branches"
+    "motivesAndTactics": "Hide in plain sight, preserve the forest, root down, swing branches",
+    "size": "large"
   },
   "flags": {},
   "_id": "XK78QUfY8c8Go8Uv",
diff --git a/src/packs/adversaries/adversary_Oracle_of_Doom_befIqd5IYKg6eUz2.json b/src/packs/adversaries/adversary_Oracle_of_Doom_befIqd5IYKg6eUz2.json
index be97acf2..b225cf7b 100644
--- a/src/packs/adversaries/adversary_Oracle_of_Doom_befIqd5IYKg6eUz2.json
+++ b/src/packs/adversaries/adversary_Oracle_of_Doom_befIqd5IYKg6eUz2.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 99,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "_id": "befIqd5IYKg6eUz2",
diff --git a/src/packs/adversaries/adversary_Outer_Realms_Abomination_A0SeeDzwjvqOsyof.json b/src/packs/adversaries/adversary_Outer_Realms_Abomination_A0SeeDzwjvqOsyof.json
index d4b37075..b10f611b 100644
--- a/src/packs/adversaries/adversary_Outer_Realms_Abomination_A0SeeDzwjvqOsyof.json
+++ b/src/packs/adversaries/adversary_Outer_Realms_Abomination_A0SeeDzwjvqOsyof.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 99,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "_id": "A0SeeDzwjvqOsyof",
diff --git a/src/packs/adversaries/adversary_Outer_Realms_Corrupter_ms6nuOl3NFkhPj1k.json b/src/packs/adversaries/adversary_Outer_Realms_Corrupter_ms6nuOl3NFkhPj1k.json
index f84bc04d..43d029ca 100644
--- a/src/packs/adversaries/adversary_Outer_Realms_Corrupter_ms6nuOl3NFkhPj1k.json
+++ b/src/packs/adversaries/adversary_Outer_Realms_Corrupter_ms6nuOl3NFkhPj1k.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 99,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "ms6nuOl3NFkhPj1k",
diff --git a/src/packs/adversaries/adversary_Outer_Realms_Thrall_moJhHgKqTKPS2WYS.json b/src/packs/adversaries/adversary_Outer_Realms_Thrall_moJhHgKqTKPS2WYS.json
index 38ed9db0..387e4006 100644
--- a/src/packs/adversaries/adversary_Outer_Realms_Thrall_moJhHgKqTKPS2WYS.json
+++ b/src/packs/adversaries/adversary_Outer_Realms_Thrall_moJhHgKqTKPS2WYS.json
@@ -104,7 +104,8 @@
       "source": "Daggerheart SRD",
       "page": 99,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "moJhHgKqTKPS2WYS",
diff --git a/src/packs/adversaries/adversary_Patchwork_Zombie_Hulk_EQTOAOUrkIvS2z88.json b/src/packs/adversaries/adversary_Patchwork_Zombie_Hulk_EQTOAOUrkIvS2z88.json
index 1575bbf8..4aca5200 100644
--- a/src/packs/adversaries/adversary_Patchwork_Zombie_Hulk_EQTOAOUrkIvS2z88.json
+++ b/src/packs/adversaries/adversary_Patchwork_Zombie_Hulk_EQTOAOUrkIvS2z88.json
@@ -40,11 +40,13 @@
     "experiences": {
       "rLPEhboQmaD7QV7T": {
         "name": "Intimidation",
-        "value": 2
+        "value": 2,
+        "description": ""
       },
       "ejtjcqd5oW6eKnav": {
         "name": "Tear Things Apart",
-        "value": 2
+        "value": 2,
+        "description": ""
       }
     },
     "bonuses": {
@@ -120,7 +122,8 @@
       "source": "Daggerheart SRD",
       "page": 83,
       "artist": ""
-    }
+    },
+    "size": "huge"
   },
   "flags": {},
   "_id": "EQTOAOUrkIvS2z88",
diff --git a/src/packs/adversaries/adversary_Perfected_Zombie_CP6iRfHdyFWniTHY.json b/src/packs/adversaries/adversary_Perfected_Zombie_CP6iRfHdyFWniTHY.json
index 3a7af054..b7844a11 100644
--- a/src/packs/adversaries/adversary_Perfected_Zombie_CP6iRfHdyFWniTHY.json
+++ b/src/packs/adversaries/adversary_Perfected_Zombie_CP6iRfHdyFWniTHY.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 101,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "_id": "CP6iRfHdyFWniTHY",
diff --git a/src/packs/adversaries/adversary_Petty_Noble_wycLpvebWdUqRhpP.json b/src/packs/adversaries/adversary_Petty_Noble_wycLpvebWdUqRhpP.json
index 6e3c052c..80235a50 100644
--- a/src/packs/adversaries/adversary_Petty_Noble_wycLpvebWdUqRhpP.json
+++ b/src/packs/adversaries/adversary_Petty_Noble_wycLpvebWdUqRhpP.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 80,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "wycLpvebWdUqRhpP",
diff --git a/src/packs/adversaries/adversary_Pirate_Captain_OROJbjsqagVh7ECV.json b/src/packs/adversaries/adversary_Pirate_Captain_OROJbjsqagVh7ECV.json
index a1c05eab..ac414c0a 100644
--- a/src/packs/adversaries/adversary_Pirate_Captain_OROJbjsqagVh7ECV.json
+++ b/src/packs/adversaries/adversary_Pirate_Captain_OROJbjsqagVh7ECV.json
@@ -122,7 +122,8 @@
       "source": "Daggerheart SRD",
       "page": 81,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "OROJbjsqagVh7ECV",
diff --git a/src/packs/adversaries/adversary_Pirate_Raiders_5YgEajn0wa4i85kC.json b/src/packs/adversaries/adversary_Pirate_Raiders_5YgEajn0wa4i85kC.json
index dd69529d..baac89b1 100644
--- a/src/packs/adversaries/adversary_Pirate_Raiders_5YgEajn0wa4i85kC.json
+++ b/src/packs/adversaries/adversary_Pirate_Raiders_5YgEajn0wa4i85kC.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 81,
       "artist": ""
-    }
+    },
+    "size": "huge"
   },
   "flags": {},
   "_id": "5YgEajn0wa4i85kC",
diff --git a/src/packs/adversaries/adversary_Pirate_Tough_mhcVkVFrzIJ18FDm.json b/src/packs/adversaries/adversary_Pirate_Tough_mhcVkVFrzIJ18FDm.json
index 6d15f7da..db91bdc1 100644
--- a/src/packs/adversaries/adversary_Pirate_Tough_mhcVkVFrzIJ18FDm.json
+++ b/src/packs/adversaries/adversary_Pirate_Tough_mhcVkVFrzIJ18FDm.json
@@ -150,7 +150,8 @@
       "source": "Daggerheart SRD",
       "page": 81,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "prototypeToken": {
     "name": "Pirate Tough",
diff --git a/src/packs/adversaries/adversary_Red_Ooze_9rVlbJVrDNn1x7PS.json b/src/packs/adversaries/adversary_Red_Ooze_9rVlbJVrDNn1x7PS.json
index dc5b66f4..3535a53f 100644
--- a/src/packs/adversaries/adversary_Red_Ooze_9rVlbJVrDNn1x7PS.json
+++ b/src/packs/adversaries/adversary_Red_Ooze_9rVlbJVrDNn1x7PS.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 80,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "9rVlbJVrDNn1x7PS",
diff --git a/src/packs/adversaries/adversary_Rotted_Zombie_gP3fWTLzSFnpA8EJ.json b/src/packs/adversaries/adversary_Rotted_Zombie_gP3fWTLzSFnpA8EJ.json
index 6a7ae3ff..eb49897a 100644
--- a/src/packs/adversaries/adversary_Rotted_Zombie_gP3fWTLzSFnpA8EJ.json
+++ b/src/packs/adversaries/adversary_Rotted_Zombie_gP3fWTLzSFnpA8EJ.json
@@ -104,7 +104,8 @@
       "source": "Daggerheart SRD",
       "page": 83,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "gP3fWTLzSFnpA8EJ",
diff --git a/src/packs/adversaries/adversary_Royal_Advisor_EtLJiTsilPPZvLUX.json b/src/packs/adversaries/adversary_Royal_Advisor_EtLJiTsilPPZvLUX.json
index ef295cb0..7d6c966d 100644
--- a/src/packs/adversaries/adversary_Royal_Advisor_EtLJiTsilPPZvLUX.json
+++ b/src/packs/adversaries/adversary_Royal_Advisor_EtLJiTsilPPZvLUX.json
@@ -122,7 +122,8 @@
       "source": "Daggerheart SRD",
       "page": 89,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "EtLJiTsilPPZvLUX",
diff --git a/src/packs/adversaries/adversary_Secret_Keeper_sLAccjvCWfeedbpI.json b/src/packs/adversaries/adversary_Secret_Keeper_sLAccjvCWfeedbpI.json
index 9c158011..064f2e9b 100644
--- a/src/packs/adversaries/adversary_Secret_Keeper_sLAccjvCWfeedbpI.json
+++ b/src/packs/adversaries/adversary_Secret_Keeper_sLAccjvCWfeedbpI.json
@@ -122,7 +122,8 @@
       "source": "Daggerheart SRD",
       "page": 89,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "sLAccjvCWfeedbpI",
diff --git a/src/packs/adversaries/adversary_Sellsword_bgreCaQ6ap2DVpCr.json b/src/packs/adversaries/adversary_Sellsword_bgreCaQ6ap2DVpCr.json
index d5da4bca..5d6d92cc 100644
--- a/src/packs/adversaries/adversary_Sellsword_bgreCaQ6ap2DVpCr.json
+++ b/src/packs/adversaries/adversary_Sellsword_bgreCaQ6ap2DVpCr.json
@@ -104,7 +104,8 @@
       "source": "Daggerheart SRD",
       "page": 81,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "bgreCaQ6ap2DVpCr",
diff --git a/src/packs/adversaries/adversary_Shambling_Zombie_2nXz4ilAY4xuhKLm.json b/src/packs/adversaries/adversary_Shambling_Zombie_2nXz4ilAY4xuhKLm.json
index 2e6d7fd2..4c27ae4a 100644
--- a/src/packs/adversaries/adversary_Shambling_Zombie_2nXz4ilAY4xuhKLm.json
+++ b/src/packs/adversaries/adversary_Shambling_Zombie_2nXz4ilAY4xuhKLm.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 84,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "2nXz4ilAY4xuhKLm",
diff --git a/src/packs/adversaries/adversary_Shark_YmVAkdNsyuXWTtYp.json b/src/packs/adversaries/adversary_Shark_YmVAkdNsyuXWTtYp.json
index dce37d5a..aeb3c752 100644
--- a/src/packs/adversaries/adversary_Shark_YmVAkdNsyuXWTtYp.json
+++ b/src/packs/adversaries/adversary_Shark_YmVAkdNsyuXWTtYp.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 90,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "YmVAkdNsyuXWTtYp",
diff --git a/src/packs/adversaries/adversary_Siren_BK4jwyXSRx7IOQiO.json b/src/packs/adversaries/adversary_Siren_BK4jwyXSRx7IOQiO.json
index e6700b73..412fc519 100644
--- a/src/packs/adversaries/adversary_Siren_BK4jwyXSRx7IOQiO.json
+++ b/src/packs/adversaries/adversary_Siren_BK4jwyXSRx7IOQiO.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 90,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "BK4jwyXSRx7IOQiO",
diff --git a/src/packs/adversaries/adversary_Skeleton_Archer_7X5q7a6ueeHs5oA9.json b/src/packs/adversaries/adversary_Skeleton_Archer_7X5q7a6ueeHs5oA9.json
index 845bd708..bd47f587 100644
--- a/src/packs/adversaries/adversary_Skeleton_Archer_7X5q7a6ueeHs5oA9.json
+++ b/src/packs/adversaries/adversary_Skeleton_Archer_7X5q7a6ueeHs5oA9.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 81,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "7X5q7a6ueeHs5oA9",
diff --git a/src/packs/adversaries/adversary_Skeleton_Dredge_6l1a3Fazq8BoKIcc.json b/src/packs/adversaries/adversary_Skeleton_Dredge_6l1a3Fazq8BoKIcc.json
index e5daed4f..b1a83ac1 100644
--- a/src/packs/adversaries/adversary_Skeleton_Dredge_6l1a3Fazq8BoKIcc.json
+++ b/src/packs/adversaries/adversary_Skeleton_Dredge_6l1a3Fazq8BoKIcc.json
@@ -104,7 +104,8 @@
       "source": "Daggerheart SRD",
       "page": 81,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "6l1a3Fazq8BoKIcc",
diff --git a/src/packs/adversaries/adversary_Skeleton_Knight_Q9LaVTyXF9NF12C7.json b/src/packs/adversaries/adversary_Skeleton_Knight_Q9LaVTyXF9NF12C7.json
index b4a349b5..769302b2 100644
--- a/src/packs/adversaries/adversary_Skeleton_Knight_Q9LaVTyXF9NF12C7.json
+++ b/src/packs/adversaries/adversary_Skeleton_Knight_Q9LaVTyXF9NF12C7.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 82,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "Q9LaVTyXF9NF12C7",
diff --git a/src/packs/adversaries/adversary_Skeleton_Warrior_10YIQl0lvCJXZLfX.json b/src/packs/adversaries/adversary_Skeleton_Warrior_10YIQl0lvCJXZLfX.json
index dbf39bed..e9a5d149 100644
--- a/src/packs/adversaries/adversary_Skeleton_Warrior_10YIQl0lvCJXZLfX.json
+++ b/src/packs/adversaries/adversary_Skeleton_Warrior_10YIQl0lvCJXZLfX.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 82,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "10YIQl0lvCJXZLfX",
diff --git a/src/packs/adversaries/adversary_Spectral_Archer_5tCkhnBByUIN5UdG.json b/src/packs/adversaries/adversary_Spectral_Archer_5tCkhnBByUIN5UdG.json
index 7dfe0c09..37398954 100644
--- a/src/packs/adversaries/adversary_Spectral_Archer_5tCkhnBByUIN5UdG.json
+++ b/src/packs/adversaries/adversary_Spectral_Archer_5tCkhnBByUIN5UdG.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 90,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "5tCkhnBByUIN5UdG",
diff --git a/src/packs/adversaries/adversary_Spectral_Captain_65cSO3EQEh6ZH6Xk.json b/src/packs/adversaries/adversary_Spectral_Captain_65cSO3EQEh6ZH6Xk.json
index dd044b50..c4da2d97 100644
--- a/src/packs/adversaries/adversary_Spectral_Captain_65cSO3EQEh6ZH6Xk.json
+++ b/src/packs/adversaries/adversary_Spectral_Captain_65cSO3EQEh6ZH6Xk.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 90,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "65cSO3EQEh6ZH6Xk",
diff --git a/src/packs/adversaries/adversary_Spectral_Guardian_UFVGl1osOsJTneLf.json b/src/packs/adversaries/adversary_Spectral_Guardian_UFVGl1osOsJTneLf.json
index 6dcd83c4..b41573f4 100644
--- a/src/packs/adversaries/adversary_Spectral_Guardian_UFVGl1osOsJTneLf.json
+++ b/src/packs/adversaries/adversary_Spectral_Guardian_UFVGl1osOsJTneLf.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 90,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "UFVGl1osOsJTneLf",
diff --git a/src/packs/adversaries/adversary_Spellblade_ldbWEL7uZs84vyrR.json b/src/packs/adversaries/adversary_Spellblade_ldbWEL7uZs84vyrR.json
index d9b3dbf3..2d9f2374 100644
--- a/src/packs/adversaries/adversary_Spellblade_ldbWEL7uZs84vyrR.json
+++ b/src/packs/adversaries/adversary_Spellblade_ldbWEL7uZs84vyrR.json
@@ -118,7 +118,8 @@
       "source": "Daggerheart SRD",
       "page": 82,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "ldbWEL7uZs84vyrR",
diff --git a/src/packs/adversaries/adversary_Spy_8zlynOhnVA59KpKT.json b/src/packs/adversaries/adversary_Spy_8zlynOhnVA59KpKT.json
index ffc4dfe7..1ebe23ff 100644
--- a/src/packs/adversaries/adversary_Spy_8zlynOhnVA59KpKT.json
+++ b/src/packs/adversaries/adversary_Spy_8zlynOhnVA59KpKT.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 90,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "8zlynOhnVA59KpKT",
diff --git a/src/packs/adversaries/adversary_Stag_Knight_KGVwnLq85ywP9xvB.json b/src/packs/adversaries/adversary_Stag_Knight_KGVwnLq85ywP9xvB.json
index 2fb0c531..3785ea48 100644
--- a/src/packs/adversaries/adversary_Stag_Knight_KGVwnLq85ywP9xvB.json
+++ b/src/packs/adversaries/adversary_Stag_Knight_KGVwnLq85ywP9xvB.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 94,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "KGVwnLq85ywP9xvB",
diff --git a/src/packs/adversaries/adversary_Stonewraith_3aAS2Qm3R6cgaYfE.json b/src/packs/adversaries/adversary_Stonewraith_3aAS2Qm3R6cgaYfE.json
index 807d6675..1c4f6b11 100644
--- a/src/packs/adversaries/adversary_Stonewraith_3aAS2Qm3R6cgaYfE.json
+++ b/src/packs/adversaries/adversary_Stonewraith_3aAS2Qm3R6cgaYfE.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 91,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "3aAS2Qm3R6cgaYfE",
diff --git a/src/packs/adversaries/adversary_Swarm_of_Rats_qNgs3AbLyJrY19nt.json b/src/packs/adversaries/adversary_Swarm_of_Rats_qNgs3AbLyJrY19nt.json
index 1db0df10..500744e2 100644
--- a/src/packs/adversaries/adversary_Swarm_of_Rats_qNgs3AbLyJrY19nt.json
+++ b/src/packs/adversaries/adversary_Swarm_of_Rats_qNgs3AbLyJrY19nt.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 82,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "qNgs3AbLyJrY19nt",
diff --git a/src/packs/adversaries/adversary_Sylvan_Soldier_VtFBt9XBE0WrGGxP.json b/src/packs/adversaries/adversary_Sylvan_Soldier_VtFBt9XBE0WrGGxP.json
index af64867f..182afa6a 100644
--- a/src/packs/adversaries/adversary_Sylvan_Soldier_VtFBt9XBE0WrGGxP.json
+++ b/src/packs/adversaries/adversary_Sylvan_Soldier_VtFBt9XBE0WrGGxP.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 82,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "VtFBt9XBE0WrGGxP",
diff --git a/src/packs/adversaries/adversary_Tangle_Bramble_Swarm_PKSXFuaIHUCoH63A.json b/src/packs/adversaries/adversary_Tangle_Bramble_Swarm_PKSXFuaIHUCoH63A.json
index 1d686445..e914cba5 100644
--- a/src/packs/adversaries/adversary_Tangle_Bramble_Swarm_PKSXFuaIHUCoH63A.json
+++ b/src/packs/adversaries/adversary_Tangle_Bramble_Swarm_PKSXFuaIHUCoH63A.json
@@ -148,7 +148,8 @@
       "source": "Daggerheart SRD",
       "page": 82,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "ownership": {
diff --git a/src/packs/adversaries/adversary_Tangle_Bramble_XcAGOSmtCFLT1unN.json b/src/packs/adversaries/adversary_Tangle_Bramble_XcAGOSmtCFLT1unN.json
index 74b228f5..18baa82c 100644
--- a/src/packs/adversaries/adversary_Tangle_Bramble_XcAGOSmtCFLT1unN.json
+++ b/src/packs/adversaries/adversary_Tangle_Bramble_XcAGOSmtCFLT1unN.json
@@ -144,7 +144,8 @@
       "source": "Daggerheart SRD",
       "page": 83,
       "artist": ""
-    }
+    },
+    "size": "tiny"
   },
   "flags": {},
   "ownership": {
diff --git a/src/packs/adversaries/adversary_Tiny_Green_Ooze_aLkLFuVoKz2NLoBK.json b/src/packs/adversaries/adversary_Tiny_Green_Ooze_aLkLFuVoKz2NLoBK.json
index 8864c47c..5371aa70 100644
--- a/src/packs/adversaries/adversary_Tiny_Green_Ooze_aLkLFuVoKz2NLoBK.json
+++ b/src/packs/adversaries/adversary_Tiny_Green_Ooze_aLkLFuVoKz2NLoBK.json
@@ -107,7 +107,8 @@
       "source": "Daggerheart SRD",
       "page": 80,
       "artist": ""
-    }
+    },
+    "size": "tiny"
   },
   "flags": {},
   "_id": "aLkLFuVoKz2NLoBK",
diff --git a/src/packs/adversaries/adversary_Tiny_Red_Ooze_1fkLQXVtmILqfJ44.json b/src/packs/adversaries/adversary_Tiny_Red_Ooze_1fkLQXVtmILqfJ44.json
index 7c3da937..a8d1efb7 100644
--- a/src/packs/adversaries/adversary_Tiny_Red_Ooze_1fkLQXVtmILqfJ44.json
+++ b/src/packs/adversaries/adversary_Tiny_Red_Ooze_1fkLQXVtmILqfJ44.json
@@ -107,7 +107,8 @@
       "source": "Daggerheart SRD",
       "page": 80,
       "artist": ""
-    }
+    },
+    "size": "tiny"
   },
   "flags": {},
   "_id": "1fkLQXVtmILqfJ44",
diff --git a/src/packs/adversaries/adversary_Treant_Sapling_o63nS0k3wHu6EgKP.json b/src/packs/adversaries/adversary_Treant_Sapling_o63nS0k3wHu6EgKP.json
index 0ff01c70..7c734bf2 100644
--- a/src/packs/adversaries/adversary_Treant_Sapling_o63nS0k3wHu6EgKP.json
+++ b/src/packs/adversaries/adversary_Treant_Sapling_o63nS0k3wHu6EgKP.json
@@ -97,13 +97,15 @@
         ]
       },
       "type": "attack",
-      "chatDisplay": false
+      "chatDisplay": false,
+      "range": ""
     },
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 95,
       "artist": ""
-    }
+    },
+    "size": "small"
   },
   "flags": {},
   "_id": "o63nS0k3wHu6EgKP",
diff --git a/src/packs/adversaries/adversary_Vampire_WWyUp6Mxl1S3KYUG.json b/src/packs/adversaries/adversary_Vampire_WWyUp6Mxl1S3KYUG.json
index 59bdb150..0ec631f1 100644
--- a/src/packs/adversaries/adversary_Vampire_WWyUp6Mxl1S3KYUG.json
+++ b/src/packs/adversaries/adversary_Vampire_WWyUp6Mxl1S3KYUG.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 95,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "WWyUp6Mxl1S3KYUG",
diff --git a/src/packs/adversaries/adversary_Vault_Guardian_Gaoler_JqYraOqNmmhHk4Yy.json b/src/packs/adversaries/adversary_Vault_Guardian_Gaoler_JqYraOqNmmhHk4Yy.json
index 575d88ee..248ff278 100644
--- a/src/packs/adversaries/adversary_Vault_Guardian_Gaoler_JqYraOqNmmhHk4Yy.json
+++ b/src/packs/adversaries/adversary_Vault_Guardian_Gaoler_JqYraOqNmmhHk4Yy.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 95,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "JqYraOqNmmhHk4Yy",
diff --git a/src/packs/adversaries/adversary_Vault_Guardian_Sentinel_FVgYb28fhxlVcGwA.json b/src/packs/adversaries/adversary_Vault_Guardian_Sentinel_FVgYb28fhxlVcGwA.json
index e0776c8c..bf525d9e 100644
--- a/src/packs/adversaries/adversary_Vault_Guardian_Sentinel_FVgYb28fhxlVcGwA.json
+++ b/src/packs/adversaries/adversary_Vault_Guardian_Sentinel_FVgYb28fhxlVcGwA.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 96,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "FVgYb28fhxlVcGwA",
diff --git a/src/packs/adversaries/adversary_Vault_Guardian_Turret_c5hGdvY5UnSjlHws.json b/src/packs/adversaries/adversary_Vault_Guardian_Turret_c5hGdvY5UnSjlHws.json
index a11bef82..cf259cdb 100644
--- a/src/packs/adversaries/adversary_Vault_Guardian_Turret_c5hGdvY5UnSjlHws.json
+++ b/src/packs/adversaries/adversary_Vault_Guardian_Turret_c5hGdvY5UnSjlHws.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 96,
       "artist": ""
-    }
+    },
+    "size": "large"
   },
   "flags": {},
   "_id": "c5hGdvY5UnSjlHws",
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 6f3d436e..25bc361c 100644
--- a/src/packs/adversaries/adversary_Volcanic_Dragon__Ashen_Tyrant_pMuXGCSOQaxpi5tb.json
+++ b/src/packs/adversaries/adversary_Volcanic_Dragon__Ashen_Tyrant_pMuXGCSOQaxpi5tb.json
@@ -150,7 +150,8 @@
       "source": "Daggerheart SRD",
       "page": 101,
       "artist": ""
-    }
+    },
+    "size": "gargantuan"
   },
   "prototypeToken": {
     "name": "Volcanic Dragon: Ashen Tyrant",
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 2fcc4ada..befbca6e 100644
--- a/src/packs/adversaries/adversary_Volcanic_Dragon__Molten_Scourge_eArAPuB38CNR0ZIM.json
+++ b/src/packs/adversaries/adversary_Volcanic_Dragon__Molten_Scourge_eArAPuB38CNR0ZIM.json
@@ -150,7 +150,8 @@
       "source": "Daggerheart SRD",
       "page": 100,
       "artist": ""
-    }
+    },
+    "size": "gargantuan"
   },
   "prototypeToken": {
     "name": "Volcanic Dragon: Molten Scourge",
diff --git a/src/packs/adversaries/adversary_Volcanic_Dragon__Obsidian_Predator_ladm7wykhZczYzrQ.json b/src/packs/adversaries/adversary_Volcanic_Dragon__Obsidian_Predator_ladm7wykhZczYzrQ.json
index 1eb81b18..be007f4e 100644
--- a/src/packs/adversaries/adversary_Volcanic_Dragon__Obsidian_Predator_ladm7wykhZczYzrQ.json
+++ b/src/packs/adversaries/adversary_Volcanic_Dragon__Obsidian_Predator_ladm7wykhZczYzrQ.json
@@ -150,7 +150,8 @@
       "source": "Daggerheart SRD",
       "page": 100,
       "artist": ""
-    }
+    },
+    "size": "gargantuan"
   },
   "prototypeToken": {
     "name": "Volcanic Dragon: Obsidian Predator",
diff --git a/src/packs/adversaries/adversary_War_Wizard_noDdT0tsN6FXSmC8.json b/src/packs/adversaries/adversary_War_Wizard_noDdT0tsN6FXSmC8.json
index efe20210..0bcb8e25 100644
--- a/src/packs/adversaries/adversary_War_Wizard_noDdT0tsN6FXSmC8.json
+++ b/src/packs/adversaries/adversary_War_Wizard_noDdT0tsN6FXSmC8.json
@@ -122,7 +122,8 @@
       "source": "Daggerheart SRD",
       "page": 91,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "noDdT0tsN6FXSmC8",
diff --git a/src/packs/adversaries/adversary_Weaponmaster_ZNbQ2jg35LG4t9eH.json b/src/packs/adversaries/adversary_Weaponmaster_ZNbQ2jg35LG4t9eH.json
index 6319c895..01d1758b 100644
--- a/src/packs/adversaries/adversary_Weaponmaster_ZNbQ2jg35LG4t9eH.json
+++ b/src/packs/adversaries/adversary_Weaponmaster_ZNbQ2jg35LG4t9eH.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 83,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "ZNbQ2jg35LG4t9eH",
diff --git a/src/packs/adversaries/adversary_Young_Dryad_8yUj2Mzvnifhxegm.json b/src/packs/adversaries/adversary_Young_Dryad_8yUj2Mzvnifhxegm.json
index 9cfb1884..fd978c58 100644
--- a/src/packs/adversaries/adversary_Young_Dryad_8yUj2Mzvnifhxegm.json
+++ b/src/packs/adversaries/adversary_Young_Dryad_8yUj2Mzvnifhxegm.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 83,
       "artist": ""
-    }
+    },
+    "size": "medium"
   },
   "flags": {},
   "_id": "8yUj2Mzvnifhxegm",
diff --git a/src/packs/adversaries/adversary_Young_Ice_Dragon_UGPiPLJsPvMTSKEF.json b/src/packs/adversaries/adversary_Young_Ice_Dragon_UGPiPLJsPvMTSKEF.json
index f025f45f..d42bda4e 100644
--- a/src/packs/adversaries/adversary_Young_Ice_Dragon_UGPiPLJsPvMTSKEF.json
+++ b/src/packs/adversaries/adversary_Young_Ice_Dragon_UGPiPLJsPvMTSKEF.json
@@ -117,7 +117,8 @@
       "source": "Daggerheart SRD",
       "page": 96,
       "artist": ""
-    }
+    },
+    "size": "huge"
   },
   "flags": {},
   "_id": "UGPiPLJsPvMTSKEF",
diff --git a/src/packs/adversaries/adversary_Zombie_Legion_YhJrP7rTBiRdX5Fp.json b/src/packs/adversaries/adversary_Zombie_Legion_YhJrP7rTBiRdX5Fp.json
index 0650319b..f93a0993 100644
--- a/src/packs/adversaries/adversary_Zombie_Legion_YhJrP7rTBiRdX5Fp.json
+++ b/src/packs/adversaries/adversary_Zombie_Legion_YhJrP7rTBiRdX5Fp.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 101,
       "artist": ""
-    }
+    },
+    "size": "huge"
   },
   "flags": {},
   "_id": "YhJrP7rTBiRdX5Fp",
diff --git a/src/packs/adversaries/adversary_Zombie_Pack_Nf0v43rtflV56V2T.json b/src/packs/adversaries/adversary_Zombie_Pack_Nf0v43rtflV56V2T.json
index 3e94c738..cf5520d6 100644
--- a/src/packs/adversaries/adversary_Zombie_Pack_Nf0v43rtflV56V2T.json
+++ b/src/packs/adversaries/adversary_Zombie_Pack_Nf0v43rtflV56V2T.json
@@ -111,7 +111,8 @@
       "source": "Daggerheart SRD",
       "page": 84,
       "artist": ""
-    }
+    },
+    "size": "huge"
   },
   "flags": {},
   "_id": "Nf0v43rtflV56V2T",
diff --git a/src/packs/beastforms/beastform_Agile_Scout_a9UoCwtrbgKk02mK.json b/src/packs/beastforms/beastform_Agile_Scout_a9UoCwtrbgKk02mK.json
index 58892f81..71018bc9 100644
--- a/src/packs/beastforms/beastform_Agile_Scout_a9UoCwtrbgKk02mK.json
+++ b/src/packs/beastforms/beastform_Agile_Scout_a9UoCwtrbgKk02mK.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/mammals/rodent-rat-diseaed-gray.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "tiny"
     },
     "mainTrait": "agility",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Aquatic_Predator_ItBVeCl2u5uetgy7.json b/src/packs/beastforms/beastform_Aquatic_Predator_ItBVeCl2u5uetgy7.json
index 46610de3..5287de84 100644
--- a/src/packs/beastforms/beastform_Aquatic_Predator_ItBVeCl2u5uetgy7.json
+++ b/src/packs/beastforms/beastform_Aquatic_Predator_ItBVeCl2u5uetgy7.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/fish/fish-marlin-swordfight-blue.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "large"
     },
     "mainTrait": "agility",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Aquatic_Scout_qqzdFCxyYupWZK23.json b/src/packs/beastforms/beastform_Aquatic_Scout_qqzdFCxyYupWZK23.json
index ef28f80c..95bea914 100644
--- a/src/packs/beastforms/beastform_Aquatic_Scout_qqzdFCxyYupWZK23.json
+++ b/src/packs/beastforms/beastform_Aquatic_Scout_qqzdFCxyYupWZK23.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/tentacles/tentacles-octopus-black-pink.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "tiny"
     },
     "mainTrait": "agility",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Armored_Sentry_8pUHJv3BYdjA4Qdf.json b/src/packs/beastforms/beastform_Armored_Sentry_8pUHJv3BYdjA4Qdf.json
index 8b752488..ba18c05f 100644
--- a/src/packs/beastforms/beastform_Armored_Sentry_8pUHJv3BYdjA4Qdf.json
+++ b/src/packs/beastforms/beastform_Armored_Sentry_8pUHJv3BYdjA4Qdf.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/reptiles/turtle-shell-glowing-green.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "small"
     },
     "mainTrait": "strength",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Epic_Aquatic_Beast_wT4xbF99I55yjKZV.json b/src/packs/beastforms/beastform_Epic_Aquatic_Beast_wT4xbF99I55yjKZV.json
index 710bb3c8..0dfe9c20 100644
--- a/src/packs/beastforms/beastform_Epic_Aquatic_Beast_wT4xbF99I55yjKZV.json
+++ b/src/packs/beastforms/beastform_Epic_Aquatic_Beast_wT4xbF99I55yjKZV.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/fish/squid-kraken-teal.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "gargantuan"
     },
     "mainTrait": "agility",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Great_Predator_afbMt4Ld6nY3mw0N.json b/src/packs/beastforms/beastform_Great_Predator_afbMt4Ld6nY3mw0N.json
index 984c72c8..450a1312 100644
--- a/src/packs/beastforms/beastform_Great_Predator_afbMt4Ld6nY3mw0N.json
+++ b/src/packs/beastforms/beastform_Great_Predator_afbMt4Ld6nY3mw0N.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/mammals/wolf-shadow-black.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "large"
     },
     "mainTrait": "strength",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Great_Winged_Beast_b4BMnTbJ3iPPidSb.json b/src/packs/beastforms/beastform_Great_Winged_Beast_b4BMnTbJ3iPPidSb.json
index 444fda44..c04b2182 100644
--- a/src/packs/beastforms/beastform_Great_Winged_Beast_b4BMnTbJ3iPPidSb.json
+++ b/src/packs/beastforms/beastform_Great_Winged_Beast_b4BMnTbJ3iPPidSb.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/birds/corvid-flying-wings-purple.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "large"
     },
     "mainTrait": "finesse",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Household_Friend_iDmOtiHJJ80AIAVT.json b/src/packs/beastforms/beastform_Household_Friend_iDmOtiHJJ80AIAVT.json
index 80756af0..cfb6aea7 100644
--- a/src/packs/beastforms/beastform_Household_Friend_iDmOtiHJJ80AIAVT.json
+++ b/src/packs/beastforms/beastform_Household_Friend_iDmOtiHJJ80AIAVT.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/mammals/rabbit-movement-glowing-green.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "tiny"
     },
     "mainTrait": "instinct",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Massive_Behemoth_qjwMzPn33aKZACkv.json b/src/packs/beastforms/beastform_Massive_Behemoth_qjwMzPn33aKZACkv.json
index 8e3c0ce5..35715056 100644
--- a/src/packs/beastforms/beastform_Massive_Behemoth_qjwMzPn33aKZACkv.json
+++ b/src/packs/beastforms/beastform_Massive_Behemoth_qjwMzPn33aKZACkv.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/mammals/beast-horned-scaled-glowing-orange.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "huge"
     },
     "mainTrait": "strength",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Mighty_Lizard_94tvcC3D5Kp4lzuN.json b/src/packs/beastforms/beastform_Mighty_Lizard_94tvcC3D5Kp4lzuN.json
index 4dcb396a..390bf054 100644
--- a/src/packs/beastforms/beastform_Mighty_Lizard_94tvcC3D5Kp4lzuN.json
+++ b/src/packs/beastforms/beastform_Mighty_Lizard_94tvcC3D5Kp4lzuN.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/reptiles/lizard-iguana-green.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "large"
     },
     "mainTrait": "instinct",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Mighty_Strider_zRLjqKx4Rn2TjivL.json b/src/packs/beastforms/beastform_Mighty_Strider_zRLjqKx4Rn2TjivL.json
index f77c7b5d..adb9627b 100644
--- a/src/packs/beastforms/beastform_Mighty_Strider_zRLjqKx4Rn2TjivL.json
+++ b/src/packs/beastforms/beastform_Mighty_Strider_zRLjqKx4Rn2TjivL.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/environment/creatures/horse-tan.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "large"
     },
     "mainTrait": "agility",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Mythic_Aerial_Hunter_jV6EuEacyQlHW4SN.json b/src/packs/beastforms/beastform_Mythic_Aerial_Hunter_jV6EuEacyQlHW4SN.json
index 34898d53..dc373c27 100644
--- a/src/packs/beastforms/beastform_Mythic_Aerial_Hunter_jV6EuEacyQlHW4SN.json
+++ b/src/packs/beastforms/beastform_Mythic_Aerial_Hunter_jV6EuEacyQlHW4SN.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/reptiles/dragon-winged-blue.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "gargantuan"
     },
     "mainTrait": "finesse",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Nimble_Grazer_CItO8yX6amQaqyk7.json b/src/packs/beastforms/beastform_Nimble_Grazer_CItO8yX6amQaqyk7.json
index 08d83325..183ad150 100644
--- a/src/packs/beastforms/beastform_Nimble_Grazer_CItO8yX6amQaqyk7.json
+++ b/src/packs/beastforms/beastform_Nimble_Grazer_CItO8yX6amQaqyk7.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/mammals/deer-antlers-glowing-blue.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "medium"
     },
     "mainTrait": "agility",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Pack_Predator_YLisKYYhAGca50WM.json b/src/packs/beastforms/beastform_Pack_Predator_YLisKYYhAGca50WM.json
index 58d28e2d..834493bb 100644
--- a/src/packs/beastforms/beastform_Pack_Predator_YLisKYYhAGca50WM.json
+++ b/src/packs/beastforms/beastform_Pack_Predator_YLisKYYhAGca50WM.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/mammals/wolf-howl-moon-forest-blue.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "medium"
     },
     "mainTrait": "strength",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Pouncing_Predator_33oFSZ1PwFqInHPe.json b/src/packs/beastforms/beastform_Pouncing_Predator_33oFSZ1PwFqInHPe.json
index 5df71fd3..d172d8f3 100644
--- a/src/packs/beastforms/beastform_Pouncing_Predator_33oFSZ1PwFqInHPe.json
+++ b/src/packs/beastforms/beastform_Pouncing_Predator_33oFSZ1PwFqInHPe.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/abilities/cougar-roar-rush-orange.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "medium"
     },
     "mainTrait": "instinct",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Powerful_Beast_m8BVTuJI1wCvzTcf.json b/src/packs/beastforms/beastform_Powerful_Beast_m8BVTuJI1wCvzTcf.json
index bbbc9a66..7fa832e6 100644
--- a/src/packs/beastforms/beastform_Powerful_Beast_m8BVTuJI1wCvzTcf.json
+++ b/src/packs/beastforms/beastform_Powerful_Beast_m8BVTuJI1wCvzTcf.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/abilities/bear-roar-bite-brown-green.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "large"
     },
     "mainTrait": "strength",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Stalking_Arachnid_A4TVRY0D5r9EiVwA.json b/src/packs/beastforms/beastform_Stalking_Arachnid_A4TVRY0D5r9EiVwA.json
index dc1ba68f..16520a9c 100644
--- a/src/packs/beastforms/beastform_Stalking_Arachnid_A4TVRY0D5r9EiVwA.json
+++ b/src/packs/beastforms/beastform_Stalking_Arachnid_A4TVRY0D5r9EiVwA.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/invertebrates/spider-mandibles-brown.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "tiny"
     },
     "mainTrait": "finesse",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Striking_Serpent_1XrZWGDttBAAUxR1.json b/src/packs/beastforms/beastform_Striking_Serpent_1XrZWGDttBAAUxR1.json
index 1cdf3fa3..f78500c9 100644
--- a/src/packs/beastforms/beastform_Striking_Serpent_1XrZWGDttBAAUxR1.json
+++ b/src/packs/beastforms/beastform_Striking_Serpent_1XrZWGDttBAAUxR1.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/reptiles/serpent-horned-green.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "small"
     },
     "mainTrait": "finesse",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Terrible_Lizard_5BABxRe2XVrYTj8N.json b/src/packs/beastforms/beastform_Terrible_Lizard_5BABxRe2XVrYTj8N.json
index d15fa0d9..49818b74 100644
--- a/src/packs/beastforms/beastform_Terrible_Lizard_5BABxRe2XVrYTj8N.json
+++ b/src/packs/beastforms/beastform_Terrible_Lizard_5BABxRe2XVrYTj8N.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/abilities/dragon-breath-purple.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "gargantuan"
     },
     "mainTrait": "strength",
     "advantageOn": {
diff --git a/src/packs/beastforms/beastform_Winged_Beast_mZ4Wlqtss2FlNNvL.json b/src/packs/beastforms/beastform_Winged_Beast_mZ4Wlqtss2FlNNvL.json
index cc78e6a4..4ca44471 100644
--- a/src/packs/beastforms/beastform_Winged_Beast_mZ4Wlqtss2FlNNvL.json
+++ b/src/packs/beastforms/beastform_Winged_Beast_mZ4Wlqtss2FlNNvL.json
@@ -9,7 +9,8 @@
     "tokenRingImg": "icons/creatures/birds/raptor-owl-flying-moon.webp",
     "tokenSize": {
       "height": null,
-      "width": null
+      "width": null,
+      "size": "tiny"
     },
     "mainTrait": "finesse",
     "advantageOn": {
diff --git a/styles/less/sheets/actors/adversary/header.less b/styles/less/sheets/actors/adversary/header.less
index aa3e6e83..8bd3fcee 100644
--- a/styles/less/sheets/actors/adversary/header.less
+++ b/styles/less/sheets/actors/adversary/header.less
@@ -40,6 +40,7 @@
             .tag {
                 display: flex;
                 flex-direction: row;
+                gap: 4px;
                 justify-content: center;
                 align-items: center;
                 padding: 3px 5px;
diff --git a/styles/less/sheets/items/beastform.less b/styles/less/sheets/items/beastform.less
index 162c4925..100b024a 100644
--- a/styles/less/sheets/items/beastform.less
+++ b/styles/less/sheets/items/beastform.less
@@ -5,5 +5,8 @@
             flex-direction: column;
             margin-top: 10px;
         }
+        .hint {
+            font-style: italic;
+        }
     }
 }
diff --git a/styles/less/ui/settings/settings.less b/styles/less/ui/settings/settings.less
index 49c9fc7c..34f17d53 100644
--- a/styles/less/ui/settings/settings.less
+++ b/styles/less/ui/settings/settings.less
@@ -16,6 +16,12 @@
             }
         }
 
+        &.three-columns {
+            display: grid;
+            grid-template-columns: 1fr 1fr 1fr;
+            gap: 2px;
+        }
+
         &.six-columns {
             display: grid;
             grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
diff --git a/templates/settings/homebrew-settings/settings.hbs b/templates/settings/homebrew-settings/settings.hbs
index e7340323..5da053f4 100644
--- a/templates/settings/homebrew-settings/settings.hbs
+++ b/templates/settings/homebrew-settings/settings.hbs
@@ -25,6 +25,20 @@
             {{/each}}
         </fieldset>
 
+        <fieldset class="three-columns">
+            <legend>
+                {{localize "Token Sizes"}} 
+                <a data-action="resetTokenSizes"><i class="fa-solid fa-arrow-rotate-left"></i></a>
+            </legend>
+
+            {{formGroup settingFields.schema.fields.tokenSizes.fields.tiny value=settingFields._source.tokenSizes.tiny localize=true}}
+            {{formGroup settingFields.schema.fields.tokenSizes.fields.small value=settingFields._source.tokenSizes.small localize=true}}
+            {{formGroup settingFields.schema.fields.tokenSizes.fields.medium value=settingFields._source.tokenSizes.medium localize=true}}
+            {{formGroup settingFields.schema.fields.tokenSizes.fields.large value=settingFields._source.tokenSizes.large localize=true}}
+            {{formGroup settingFields.schema.fields.tokenSizes.fields.huge value=settingFields._source.tokenSizes.huge localize=true}}
+            {{formGroup settingFields.schema.fields.tokenSizes.fields.gargantuan value=settingFields._source.tokenSizes.gargantuan localize=true}}
+        </fieldset>
+
         <fieldset>
             <legend>
                 {{localize "DAGGERHEART.SETTINGS.Homebrew.currency.title"}} 
diff --git a/templates/sheets-settings/adversary-settings/details.hbs b/templates/sheets-settings/adversary-settings/details.hbs
index 194c7f0c..0eb8da30 100644
--- a/templates/sheets-settings/adversary-settings/details.hbs
+++ b/templates/sheets-settings/adversary-settings/details.hbs
@@ -13,6 +13,7 @@
             {{/if}}
             {{formGroup systemFields.difficulty value=document._source.system.difficulty localize=true}}
         </div>
+        {{formGroup systemFields.size value=document._source.system.size label=(localize "DAGGERHEART.GENERAL.tokenSize") localize=true}}
         {{formField systemFields.description value=document._source.system.description label=(localize "DAGGERHEART.ACTORS.Adversary.FIELDS.description.label")}}
         {{formField systemFields.motivesAndTactics value=document._source.system.motivesAndTactics label=(localize "DAGGERHEART.ACTORS.Adversary.FIELDS.motivesAndTactics.label")}}
     </fieldset>
diff --git a/templates/sheets-settings/token-config/appearance.hbs b/templates/sheets-settings/token-config/appearance.hbs
new file mode 100644
index 00000000..0f6019ba
--- /dev/null
+++ b/templates/sheets-settings/token-config/appearance.hbs
@@ -0,0 +1,82 @@
+<div class="tab scrollable{{#if tab.active}} active{{/if}}" data-group="{{tab.group}}" data-tab="{{tab.id}}">
+    {{formGroup fields.texture.fields.src value=source.texture.src rootId=rootId}}
+    {{#if randomImgEnabled}}
+    {{formGroup fields.randomImg value=source.randomImg classes="slim" rootId=rootId}}
+    {{else if hasAlternates}}
+    <div class="form-group">
+        <label for="{{rootId}}-alternateImages">{{localize "TOKEN.ImageAlts"}}</label>
+        <select id="{{rootId}}-alternateImages" class="alternate-images" name="alternateImages">
+            {{selectOptions alternateImages selected=source.texture.src blank=""}}
+        </select>
+    </div>
+    {{/if}}
+
+
+    <div class="form-group slim" {{#if actorSizeUsed}}data-tooltip="{{localize "DAGGERHEART.APPLICATIONS.TokenConfig.actorSizeUsed"}}"{{/if}}>
+        <label>
+            {{localize "TOKEN.Dimensions"}} <span class="units">({{localize "GridSpaces"}})</span>
+            {{#if actorSizeUsed}}
+                <i class="fa-solid fa-lock"></i>
+            {{/if}}
+        </label>
+        <div class="form-fields">
+            <label for="{{rootId}}-width">{{localize "DOCUMENT.FIELDS.width.label"}}</label>
+            {{formInput fields.width value=source.width id=(concat rootId "-width") disabled=actorSizeUsed}}
+            <label for="{{rootId}}-height">{{localize "DOCUMENT.FIELDS.height.label"}}</label>
+            {{formInput fields.height value=source.height id=(concat rootId "-height") disabled=actorSizeUsed}}
+        </div>
+    </div>
+
+    {{#if shapes}}
+    {{formGroup fields.shape value=source.shape choices=shapes classes="slim" rootId=rootId}}
+    {{/if}}
+    {{formGroup fields.texture.fields.fit value=source.texture.fit choices=textureFitModes classes="slim" rootId=rootId}}
+
+    <div class="form-group slim">
+        <label>{{localize "Anchor"}}</label>
+        <div class="form-fields">
+            <label for="{{rootId}}-anchorX">{{localize "TOKEN.FIELDS.texture.anchorX.label"}}</label>
+            {{formInput fields.texture.fields.anchorX value=source.texture.anchorX id=(concat rootId "-anchorX")
+                placeholder="0.5"}}
+            <label for="{{rootId}}-anchorY">{{localize "TOKEN.FIELDS.texture.anchorY.label"}}</label>
+            {{formInput fields.texture.fields.anchorY value=source.texture.anchorY id=(concat rootId "-anchorY")
+                placeholder="0.5"}}
+        </div>
+        <p class="hint">{{localize "TOKEN.AnchorHint"}}</p>
+    </div>
+
+    <div class="form-group">
+        <label for="{{rootId}}-scale">{{localize "Scale"}} <span class="units">({{localize "Ratio"}})</span></label>
+        <div class="form-fields">
+            <range-picker id="{{rootId}}-scale" name="scale" value={{scale}} min="0.2" max="3" step="0.05"></range-picker>
+        </div>
+    </div>
+
+    <div class="form-group slim">
+        <label>{{localize "TOKEN.Mirror"}}</label>
+        <div class="form-fields">
+            <label class="checkbox" for="{{rootId}}-mirrorX">
+                {{localize "TOKEN.MirrorX"}}
+                <input type="checkbox" id="{{rootId}}-mirrorX" name="mirrorX" {{checked mirrorX}}>
+            </label>
+            <label class="checkbox" for="{{rootId}}-mirrorY">
+                {{localize "TOKEN.MirrorY"}}
+                <input type="checkbox" id="{{rootId}}-mirrorY" name="mirrorY" {{checked mirrorY}}>
+            </label>
+        </div>
+    </div>
+
+    {{formGroup fields.texture.fields.tint value=source.texture.tint placeholder="#ffffff" rootId=rootId}}
+    {{formGroup fields.alpha value=source.alpha step=0.05 rootId=rootId}}
+    {{formGroup fields.lockRotation value=source.lockRotation rootId=rootId}}
+
+    <fieldset>
+        <legend>{{localize "TOKEN.RING.SHEET.legend"}}</legend>
+        {{formGroup fields.ring.fields.enabled value=source.ring.enabled rootId=rootId}}
+        {{formGroup fields.ring.fields.colors.fields.ring value=source.ring.colors.ring rootId=rootId}}
+        {{formGroup fields.ring.fields.colors.fields.background value=source.ring.colors.background rootId=rootId}}
+        {{formGroup fields.ring.fields.subject.fields.texture value=source.ring.subject.texture rootId=rootId}}
+        {{formGroup fields.ring.fields.subject.fields.scale value=source.ring.subject.scale max=3 step=0.02 rootId=rootId}}
+        {{formGroup fields.ring.fields.effects value=source.ring.effects input=ringEffectsInput stacked=true rootId=rootId}}
+    </fieldset>
+</div>
diff --git a/templates/sheets/actors/adversary/header.hbs b/templates/sheets/actors/adversary/header.hbs
index 42a673d5..5bdfa421 100644
--- a/templates/sheets/actors/adversary/header.hbs
+++ b/templates/sheets/actors/adversary/header.hbs
@@ -18,6 +18,14 @@
                 <span>/{{localize "DAGGERHEART.GENERAL.HitPoints.short"}}</span>
             </div>
         {{/if}}
+        <div class="tag" data-tooltip="DAGGERHEART.UI.Tooltip.tokenSize">
+            <i class="fa-solid fa-circle-user"></i>
+            {{#unless (eq source.system.size 'custom')}}
+                <span>{{localize (concat "DAGGERHEART.CONFIG.TokenSize." source.system.size)}}</span>
+            {{else}}
+                <span>{{source.prototypeToken.width}}x{{source.prototypeToken.height}}</span>
+            {{/unless}}
+        </div>
     </div>
     <line-div></line-div>
     <div class="adversary-info">
diff --git a/templates/sheets/items/beastform/settings.hbs b/templates/sheets/items/beastform/settings.hbs
index c0ea3965..844b9d61 100644
--- a/templates/sheets/items/beastform/settings.hbs
+++ b/templates/sheets/items/beastform/settings.hbs
@@ -20,18 +20,35 @@
         {{/unless}}
     {{/if}}
 
-    <fieldset class="two-columns even">
+    <fieldset>
         <legend>{{localize "DAGGERHEART.ITEMS.Beastform.tokenTitle"}}</legend>
+        {{#unless (eq source.system.beastformType 'evolved')}}
+            <div class="full-width">
+                {{formGroup systemFields.tokenImg value=source.system.tokenImg localize=true}}
+            </div>
 
-        <div class="full-width">
-            {{formGroup systemFields.tokenImg value=source.system.tokenImg localize=true}}
-        </div>
-
-        <div class="full-width">
-            {{formGroup systemFields.tokenRingImg value=source.system.tokenRingImg localize=true}}
-        </div>
-
-        {{formGroup systemFields.tokenSize.fields.height value=source.system.tokenSize.height localize=true placeholder=(localize "DAGGERHEART.ITEMS.Beastform.FIELDS.tokenSize.placeholder") }}
-        {{formGroup systemFields.tokenSize.fields.width value=source.system.tokenSize.width localize=true placeholder=(localize "DAGGERHEART.ITEMS.Beastform.FIELDS.tokenSize.placeholder")}}
+            <div class="full-width">
+                {{formGroup systemFields.tokenRingImg value=source.system.tokenRingImg localize=true}}
+            </div>
+            <div class="nest-inputs">
+                {{formGroup systemFields.tokenSize.fields.size value=source.system.tokenSize.size label=(localize "DAGGERHEART.GENERAL.tokenSize") localize=true }}
+                {{formGroup 
+                    systemFields.tokenSize.fields.height 
+                    value=source.system.tokenSize.height 
+                    localize=true 
+                    placeholder=(localize (ifThen dimensionsDisabled "DAGGERHEART.ITEMS.Beastform.FIELDS.tokenSize.disabledPlaceholder" "DAGGERHEART.ITEMS.Beastform.FIELDS.tokenSize.placeholder")) 
+                    disabled=dimensionsDisabled 
+                }}
+                {{formGroup 
+                    systemFields.tokenSize.fields.width 
+                    value=source.system.tokenSize.width 
+                    localize=true 
+                    placeholder=(localize (ifThen dimensionsDisabled "DAGGERHEART.ITEMS.Beastform.FIELDS.tokenSize.disabledPlaceholder" "DAGGERHEART.ITEMS.Beastform.FIELDS.tokenSize.placeholder")) 
+                    disabled=dimensionsDisabled 
+                }}
+            </div>
+        {{else}}
+            <span class="hint">{{localize "DAGGERHEART.ITEMS.Beastform.evolvedTokenHint"}}</span>
+        {{/unless}}
     </fieldset>
 </section>
\ No newline at end of file