diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 553a1a17..4ffcc64d 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -37,6 +37,7 @@ jobs:
         url: https://github.com/${{github.repository}}
         manifest: https://raw.githubusercontent.com/${{github.repository}}/v14/system.json
         download: https://github.com/${{github.repository}}/releases/download/${{github.event.release.tag_name}}/system.zip
+        flags.hotReload: false
 
     # Create a zip file with all files required by the module to add to the release
     - run: zip -r ./system.zip system.json README.md LICENSE build/daggerheart.js build/tagify.css styles/daggerheart.css assets/ templates/ packs/ lang/
diff --git a/module/applications/dialogs/tagTeamDialog.mjs b/module/applications/dialogs/tagTeamDialog.mjs
index e06cbe48..ba76831f 100644
--- a/module/applications/dialogs/tagTeamDialog.mjs
+++ b/module/applications/dialogs/tagTeamDialog.mjs
@@ -38,6 +38,9 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
         tag: 'form',
         classes: ['daggerheart', 'views', 'dh-style', 'dialog', 'tag-team-dialog'],
         position: { width: 550, height: 'auto' },
+        window: {
+            icon: 'fa-solid fa-user-group'
+        },
         actions: {
             toggleSelectMember: TagTeamDialog.#toggleSelectMember,
             startTagTeamRoll: TagTeamDialog.#startTagTeamRoll,
diff --git a/module/applications/levelup/characterLevelup.mjs b/module/applications/levelup/characterLevelup.mjs
index f7ef2ffa..e8d6cf1c 100644
--- a/module/applications/levelup/characterLevelup.mjs
+++ b/module/applications/levelup/characterLevelup.mjs
@@ -156,6 +156,7 @@ export default class DhCharacterLevelUp extends LevelUpBase {
                 if (multiclasses?.[0]) {
                     const data = multiclasses[0];
                     const multiclass = data.data.length > 0 ? await foundry.utils.fromUuid(data.data[0]) : {};
+                    const subclasses = (await multiclass?.system?.fetchSubclasses()) ?? [];
 
                     context.multiclass = {
                         ...data,
@@ -175,13 +176,12 @@ export default class DhCharacterLevelUp extends LevelUpBase {
                                         alreadySelected
                                 };
                             }) ?? [],
-                        subclasses:
-                            multiclass?.system?.subclasses.map(subclass => ({
-                                ...subclass,
-                                uuid: subclass.uuid,
-                                selected: data.secondaryData.subclass === subclass.uuid,
-                                disabled: data.secondaryData.subclass && data.secondaryData.subclass !== subclass.uuid
-                            })) ?? [],
+                        subclasses: subclasses.map(subclass => ({
+                            ...subclass,
+                            uuid: subclass.uuid,
+                            selected: data.secondaryData.subclass === subclass.uuid,
+                            disabled: data.secondaryData.subclass && data.secondaryData.subclass !== subclass.uuid
+                        })),
                         compendium: 'classes',
                         limit: 1
                     };
diff --git a/module/applications/sheets/actors/party.mjs b/module/applications/sheets/actors/party.mjs
index 403960c0..c703ad85 100644
--- a/module/applications/sheets/actors/party.mjs
+++ b/module/applications/sheets/actors/party.mjs
@@ -44,7 +44,10 @@ export default class Party extends DHBaseActorSheet {
     static PARTS = {
         header: { template: 'systems/daggerheart/templates/sheets/actors/party/header.hbs' },
         tabs: { template: 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs' },
-        partyMembers: { template: 'systems/daggerheart/templates/sheets/actors/party/party-members.hbs' },
+        partyMembers: {
+            template: 'systems/daggerheart/templates/sheets/actors/party/party-members.hbs',
+            scrollable: ['']
+        },
         /* NOT YET IMPLEMENTED */
         // projects: {
         //     template: 'systems/daggerheart/templates/sheets/actors/party/projects.hbs',
diff --git a/module/applications/ui/itemBrowser.mjs b/module/applications/ui/itemBrowser.mjs
index 99b9a23d..d98cf2da 100644
--- a/module/applications/ui/itemBrowser.mjs
+++ b/module/applications/ui/itemBrowser.mjs
@@ -109,8 +109,8 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
             CONFIG.DH.id,
             CONFIG.DH.FLAGS[`${this.compendiumBrowserTypeKey}`].position
         );
-
         options.position = userPresetPosition ?? ItemBrowser.DEFAULT_OPTIONS.position;
+        delete options.position.zIndex;
 
         if (!userPresetPosition) {
             const width = noFolder === true || lite === true ? 600 : 850;
diff --git a/module/canvas/placeables/token.mjs b/module/canvas/placeables/token.mjs
index 77c178d6..68e325c2 100644
--- a/module/canvas/placeables/token.mjs
+++ b/module/canvas/placeables/token.mjs
@@ -249,9 +249,6 @@ export default class DhTokenPlaceable extends foundry.canvas.placeables.Token {
 
     /** @inheritDoc */
     _drawBar(number, bar, data) {
-        const val = Number(data.value);
-        const pct = Math.clamp(val, 0, data.max) / data.max;
-
         // Determine sizing
         const { width, height } = this.document.getSize();
         const s = canvas.dimensions.uiScale;
@@ -259,17 +256,19 @@ export default class DhTokenPlaceable extends foundry.canvas.placeables.Token {
         const bh = 8 * (this.document.height >= 2 ? 1.5 : 1) * s;
 
         // Determine the color to use
-        const fillColor =
-            number === 0 ? foundry.utils.Color.fromRGB([1, 0, 0]) : foundry.utils.Color.fromString('#0032b1');
+        const Color = foundry.utils.Color;
+        const fillColor = number === 0 ? Color.fromRGB([1, 0, 0]) : Color.fromString('#0032b1');
+        const emptyColor = Color.fromRGB([0, 0, 0]);
 
-        // Draw the bar
-        const widthUnit = bw / data.max;
+        // Draw the bar (accounting floating point numbers from bar animations)
+        const widthUnit = bw / Math.ceil(data.max);
         bar.clear().lineStyle(s, 0x000000, 1.0);
-        const sections = [...Array(data.max).keys()];
-        for (let mark of sections) {
+        const sections = [...Array(Math.ceil(data.max)).keys()];
+        for (const mark of sections) {
             const x = mark * widthUnit;
-            const marked = mark + 1 <= data.value;
-            const color = marked ? fillColor : foundry.utils.Color.fromRGB([0, 0, 0]);
+            const marked = mark < Math.ceil(data.value);
+            const remainder = mark === Math.ceil(data.value) - 1 ? data.value % 1 : 0;
+            const color = !marked ? emptyColor : remainder ? emptyColor.mix(fillColor, remainder) : fillColor;
             if (mark === 0 || mark === sections.length - 1) {
                 bar.beginFill(color, marked ? 1.0 : 0.5).drawRect(x, 0, widthUnit, bh, 2 * s); // Would like drawRoundedRect, but it's very troublsome with the corners. Leaving for now.
             } else {
diff --git a/styles/less/dialog/character-creation/selections-container.less b/styles/less/dialog/character-creation/selections-container.less
index 2bbac484..24217dbf 100644
--- a/styles/less/dialog/character-creation/selections-container.less
+++ b/styles/less/dialog/character-creation/selections-container.less
@@ -114,9 +114,6 @@
 
             .card-preview-container {
                 flex: 1;
-            }
-
-            .card-preview-container {
                 border-color: light-dark(@dark-blue, @golden);
             }
 
diff --git a/styles/less/dialog/group-roll-dialog/_common.less b/styles/less/dialog/group-roll-dialog/_common.less
index 41573718..b04f6893 100644
--- a/styles/less/dialog/group-roll-dialog/_common.less
+++ b/styles/less/dialog/group-roll-dialog/_common.less
@@ -1,9 +1,7 @@
 h1 {
     color: light-dark(@dark-blue, @golden);
-    font-family: var(--dh-font-subtitle);
-    font-size: var(--font-size-24);
+    font: 700 var(--font-size-24) var(--dh-font-subtitle);
     text-align: center;
-    font-weight: 700;
 }
 
 header {
diff --git a/styles/less/dialog/index.less b/styles/less/dialog/index.less
index eb882eeb..11d9635e 100644
--- a/styles/less/dialog/index.less
+++ b/styles/less/dialog/index.less
@@ -1,10 +1,5 @@
 @import './attribution/sheet.less';
-@import './level-up/navigation-container.less';
-@import './level-up/selections-container.less';
-@import './level-up/sheet.less';
-@import './level-up/summary-container.less';
-@import './level-up/tiers-container.less';
-@import './level-up/footer.less';
+@import './level-up/index.less';
 
 @import './resource-dice/sheet.less';
 
diff --git a/styles/less/dialog/level-up/index.less b/styles/less/dialog/level-up/index.less
new file mode 100644
index 00000000..849a4d36
--- /dev/null
+++ b/styles/less/dialog/level-up/index.less
@@ -0,0 +1,6 @@
+@import './navigation-container.less';
+@import './selections-container.less';
+@import './summary-container.less';
+@import './tiers-container.less';
+@import './footer.less';
+@import './sheet.less';
diff --git a/styles/less/dialog/level-up/selections-container.less b/styles/less/dialog/level-up/selections-container.less
index 6a551865..8c0dbaec 100644
--- a/styles/less/dialog/level-up/selections-container.less
+++ b/styles/less/dialog/level-up/selections-container.less
@@ -3,12 +3,7 @@
 
 .daggerheart.levelup {
     .levelup-selections-container {
-        overflow: auto;
         padding: 10px 0;
-        scrollbar-width: thin;
-        scrollbar-color: light-dark(@dark-blue, @golden) transparent;
-        max-height: 500px;
-        mask-image: linear-gradient(0deg, transparent 0%, black 5%, black 95%, transparent 100%);
 
         .achievement-experience-cards {
             display: flex;
@@ -45,20 +40,22 @@
 
         .levelup-card-selection {
             display: flex;
-            flex-wrap: wrap;
             justify-content: center;
             gap: 40px;
             height: 190px;
+            align-items: stretch;
 
             .card-preview-container {
-                height: 100%;
+                height: 190px;
                 max-width: 200px;
             }
 
             .levelup-domains-selection-container {
-                display: flex;
-                flex-direction: column;
-                gap: 8px;
+                display: grid;
+                grid-auto-flow: column;
+                grid-template-rows: repeat(2, minmax(0, 1fr));
+                height: 100%;
+                gap: 4px;
 
                 .levelup-domain-selection-container {
                     display: flex;
@@ -66,6 +63,8 @@
                     align-items: center;
                     position: relative;
                     cursor: pointer;
+                    overflow: hidden;
+                    width: 93px;
 
                     &.disabled {
                         pointer-events: none;
@@ -74,16 +73,20 @@
 
                     .levelup-domain-label {
                         position: absolute;
+                        left: 0;
+                        right: 0;
+                        bottom: 0;
                         text-align: center;
-                        top: 4px;
                         background: grey;
-                        padding: 0 12px;
-                        border-radius: 6px;
+                        padding: 2px 12px;
                         z-index: 2;
+                        line-height: 1;
                     }
 
                     img {
-                        height: 124px;
+                        object-fit: cover;
+                        width: auto;
+                        height: auto;
 
                         &.svg {
                             filter: @beige-filter;
@@ -92,17 +95,18 @@
 
                     .levelup-domain-selected {
                         position: absolute;
-                        height: 54px;
-                        width: 54px;
+                        height: 40px;
+                        width: 40px;
                         border-radius: 50%;
-                        border: 2px solid;
-                        font-size: var(--font-size-48);
+                        border: 2px solid @golden;
+                        font-size: var(--font-size-24);
                         display: flex;
                         align-items: center;
                         justify-content: center;
-                        background-image: url(../assets/parchments/dh-parchment-light.png);
-                        color: var(--color-dark-5);
-                        top: calc(50% - 29px);
+                        background: @dark-golden;
+                        color: @golden;
+                        top: 10px;
+                        z-index: 2;
 
                         i {
                             position: relative;
diff --git a/styles/less/dialog/level-up/sheet.less b/styles/less/dialog/level-up/sheet.less
index ade7c8a9..c663f304 100644
--- a/styles/less/dialog/level-up/sheet.less
+++ b/styles/less/dialog/level-up/sheet.less
@@ -11,9 +11,11 @@
 });
 
 .daggerheart.levelup {
-    .window-content {
-        max-height: 960px;
+    .tab.active {
+        flex: 1;
         overflow: auto;
+        scrollbar-width: thin;
+        scrollbar-color: light-dark(@dark-blue, @golden) transparent;
     }
 
     div[data-application-part='form'] {
@@ -22,15 +24,13 @@
         gap: 8px;
     }
 
-    section {
-        .section-container {
-            display: flex;
-            flex-direction: row;
-            justify-content: center;
-            gap: 20px 8px;
-            margin-top: 8px;
-            flex-wrap: wrap;
-        }
+    .section-container {
+        display: flex;
+        flex-direction: row;
+        justify-content: center;
+        gap: 20px 8px;
+        margin-top: 8px;
+        flex-wrap: wrap;
     }
 
     .levelup-footer {
diff --git a/styles/less/dialog/level-up/summary-container.less b/styles/less/dialog/level-up/summary-container.less
index d67abff6..97353ba7 100644
--- a/styles/less/dialog/level-up/summary-container.less
+++ b/styles/less/dialog/level-up/summary-container.less
@@ -17,8 +17,6 @@
     .levelup-summary-container {
         overflow: auto;
         padding: 10px 0;
-        scrollbar-width: thin;
-        scrollbar-color: light-dark(@dark-blue, @golden) transparent;
         max-height: 700px;
         mask-image: linear-gradient(0deg, transparent 0%, black 5%, black 95%, transparent 100%);
 
diff --git a/styles/less/dialog/tag-team-dialog/initialization.less b/styles/less/dialog/tag-team-dialog/initialization.less
index 8557d231..2d015141 100644
--- a/styles/less/dialog/tag-team-dialog/initialization.less
+++ b/styles/less/dialog/tag-team-dialog/initialization.less
@@ -7,39 +7,85 @@
 }
 
 .daggerheart.dialog.dh-style.views.tag-team-dialog {
-    .initialization-container {
+    .initialization-container.active {
+        display: flex;
+        flex-direction: column;
+        gap: var(--spacer-4);
+
         h2 {
             text-align: center;
         }
 
         .members-container {
-            display: grid;
-            grid-template-columns: 1fr 1fr 1fr 1fr;
+            display: flex;
+            flex-wrap: wrap;
+            justify-content: center;
             gap: 8px;
 
+            // Force 3 columns for 5 -> 6 players
+            &:has(> :nth-child(5)):not(:has(> :nth-child(7))) {
+                padding-left: 10%;
+                padding-right: 10%;
+            }
+
             .member-container {
                 position: relative;
                 display: flex;
+                align-items: stretch;
                 justify-content: center;
+                border-radius: 6px;
+                border: 1px solid light-dark(@dark-blue, @golden);
+                overflow: hidden;
+                height: 11.5rem;
+                width: 122px;
 
                 &.inactive {
-                    opacity: 0.4;
+                    border-color: light-dark(@dark-blue-40, @golden-40);
+                    img {
+                        opacity: 0.4;
+                    }
                 }
 
                 .member-name {
+                    --shadow-color: light-dark(white, black);
                     position: absolute;
-                    padding: 0 2px;
-                    border: 1px solid;
-                    border-radius: 6px;
-                    margin-top: 4px;
-                    color: light-dark(@dark, @beige);
-                    background-image: url('../assets/parchments/dh-parchment-dark.png');
+                    bottom: 0;
+                    left: 0;
+                    right: 0;
+
+                    display: flex;
+                    flex-direction: column;
+                    justify-content: flex-end;
+                    min-height: 4rem;
+                    padding: 5rem 4px var(--spacer-8) 4px;
                     text-align: center;
+
+                    color: var(--color-text-primary);
+                    text-shadow: 1px 1px 2px var(--shadow-color), 0 0 10px var(--shadow-color);
+
+                    // Basic "scrim" gradient
+                    background-image: linear-gradient(
+                        to top,
+                        var(--shadow-color),
+                        rgba(from var(--shadow-color) r g b / 0.834) 10.6%,
+                        rgba(from var(--shadow-color) r g b / 0.541) 34%,
+                        rgba(from var(--shadow-color) r g b / 0.382) 47%,
+                        rgba(from var(--shadow-color) r g b / 0.194) 65%,
+                        transparent 100%
+                    );
                 }
 
                 img {
-                    border-radius: 6px;
-                    border: 1px solid light-dark(@dark-blue, @golden);
+                    object-fit: cover;
+                    object-position: top center;
+                    flex: 1;
+                }
+
+                .leader-mark {
+                    position: absolute;
+                    top: 4px;
+                    right: 4px;
+                    text-shadow: var(--shadow-text-stroke), 0 0 20px black;
                 }
             }
         }
diff --git a/styles/less/dialog/tag-team-dialog/sheet.less b/styles/less/dialog/tag-team-dialog/sheet.less
index dc8f16dc..a8dffbd2 100644
--- a/styles/less/dialog/tag-team-dialog/sheet.less
+++ b/styles/less/dialog/tag-team-dialog/sheet.less
@@ -1,4 +1,10 @@
-.daggerheart.dialog.dh-style.views.tag-team-dialog {
+.daggerheart.dialog.dh-style.views.tag-team-dialog .window-content {
+    h1 {
+        color: light-dark(@dark-blue, @golden);
+        font: 700 var(--font-size-24) var(--dh-font-subtitle);
+        text-align: center;
+    }
+
     .team-container {
         display: flex;
         gap: 16px;
diff --git a/styles/less/global/elements.less b/styles/less/global/elements.less
index 05e679b5..181bd0d3 100755
--- a/styles/less/global/elements.less
+++ b/styles/less/global/elements.less
@@ -96,8 +96,6 @@
 
     textarea {
         color: light-dark(@dark, @beige);
-        scrollbar-width: thin;
-        scrollbar-color: light-dark(@dark-blue, @golden) transparent;
     }
 
     button:where(:not(.plain)) {
@@ -804,6 +802,7 @@
 
         .preview-image-container {
             width: 100%;
+            min-height: 0;
             flex-grow: 1;
             object-fit: cover;
             border-radius: 4px 4px 0 0;
diff --git a/styles/less/global/feature-section.less b/styles/less/global/feature-section.less
index 7d5099e1..2fd4e20f 100644
--- a/styles/less/global/feature-section.less
+++ b/styles/less/global/feature-section.less
@@ -5,8 +5,6 @@
     .tab.features {
         padding: 0 10px;
         overflow-y: auto;
-        scrollbar-width: thin;
-        scrollbar-color: light-dark(@dark-blue, @golden) transparent;
         .feature-list {
             display: flex;
             flex-direction: column;
diff --git a/styles/less/global/global.less b/styles/less/global/global.less
index b9af67c0..644d03b8 100644
--- a/styles/less/global/global.less
+++ b/styles/less/global/global.less
@@ -12,6 +12,11 @@
 }
 
 .daggerheart.dh-style {
+    * {
+        scrollbar-width: thin;
+        scrollbar-color: light-dark(@dark-blue, @golden) transparent;
+    }
+
     .hint {
         flex: 0 0 100%;
         margin: 0;
diff --git a/styles/less/global/prose-mirror.less b/styles/less/global/prose-mirror.less
index 8a663e28..8412235d 100644
--- a/styles/less/global/prose-mirror.less
+++ b/styles/less/global/prose-mirror.less
@@ -10,8 +10,6 @@
             background-color: transparent;
         }
         .editor-content {
-            scrollbar-width: thin;
-            scrollbar-color: light-dark(@dark-blue, @golden) transparent;
             h1 {
                 font-size: var(--font-size-32);
             }
diff --git a/styles/less/sheets-settings/adversary-settings/features.less b/styles/less/sheets-settings/adversary-settings/features.less
index 4e0f6a8f..15b1fa18 100644
--- a/styles/less/sheets-settings/adversary-settings/features.less
+++ b/styles/less/sheets-settings/adversary-settings/features.less
@@ -5,8 +5,6 @@
     .tab.features {
         max-height: 450px;
         overflow-y: auto;
-        scrollbar-width: thin;
-        scrollbar-color: light-dark(@dark-blue, @golden) transparent;
 
         .add-feature-btn {
             width: 100%;
diff --git a/styles/less/sheets-settings/environment-settings/adversaries.less b/styles/less/sheets-settings/environment-settings/adversaries.less
index 1a27eaca..2ce4819a 100644
--- a/styles/less/sheets-settings/environment-settings/adversaries.less
+++ b/styles/less/sheets-settings/environment-settings/adversaries.less
@@ -5,8 +5,6 @@
     .tab.adversaries {
         max-height: 450px;
         overflow-y: auto;
-        scrollbar-width: thin;
-        scrollbar-color: light-dark(@dark-blue, @golden) transparent;
 
         .add-action-btn {
             width: 100%;
diff --git a/styles/less/sheets-settings/environment-settings/features.less b/styles/less/sheets-settings/environment-settings/features.less
index d907837a..db6b544d 100644
--- a/styles/less/sheets-settings/environment-settings/features.less
+++ b/styles/less/sheets-settings/environment-settings/features.less
@@ -5,8 +5,6 @@
     .tab.features {
         max-height: 450px;
         overflow-y: auto;
-        scrollbar-width: thin;
-        scrollbar-color: light-dark(@dark-blue, @golden) transparent;
 
         .add-feature-btn {
             width: 100%;
diff --git a/styles/less/sheets/actors/adversary/actions.less b/styles/less/sheets/actors/adversary/actions.less
index 00395ebd..af870d9b 100644
--- a/styles/less/sheets/actors/adversary/actions.less
+++ b/styles/less/sheets/actors/adversary/actions.less
@@ -10,9 +10,6 @@
             overflow-y: auto;
             mask-image: linear-gradient(0deg, transparent 0%, black 5%);
             padding-bottom: 20px;
-
-            scrollbar-width: thin;
-            scrollbar-color: light-dark(@dark-blue, @golden) transparent;
         }
     }
 }
diff --git a/styles/less/sheets/actors/adversary/effects.less b/styles/less/sheets/actors/adversary/effects.less
index 4afe2454..fbf74249 100644
--- a/styles/less/sheets/actors/adversary/effects.less
+++ b/styles/less/sheets/actors/adversary/effects.less
@@ -9,9 +9,6 @@
             overflow-y: auto;
             mask-image: linear-gradient(0deg, transparent 0%, black 5%);
             padding-bottom: 20px;
-
-            scrollbar-width: thin;
-            scrollbar-color: light-dark(@dark-blue, @golden) transparent;
         }
     }
 }
diff --git a/styles/less/sheets/actors/adversary/sidebar.less b/styles/less/sheets/actors/adversary/sidebar.less
index 4e7535c1..ef99bc09 100644
--- a/styles/less/sheets/actors/adversary/sidebar.less
+++ b/styles/less/sheets/actors/adversary/sidebar.less
@@ -287,12 +287,11 @@
             padding-top: 10px;
             padding-bottom: 20px;
             mask-image: linear-gradient(0deg, transparent 0%, black 5%, black 95%, transparent 100%);
-            scrollbar-width: thin;
+            
             scrollbar-gutter: stable;
 
             &:hover {
                 overflow-y: auto;
-                scrollbar-color: light-dark(@dark-blue, @golden) transparent;
             }
         }
 
diff --git a/styles/less/sheets/actors/character/biography.less b/styles/less/sheets/actors/character/biography.less
index b7c6ba6e..f8d56735 100644
--- a/styles/less/sheets/actors/character/biography.less
+++ b/styles/less/sheets/actors/character/biography.less
@@ -13,9 +13,6 @@
             padding-top: 8px;
             padding-bottom: 20px;
             height: 100%;
-
-            scrollbar-width: thin;
-            scrollbar-color: light-dark(@dark-blue, @golden) transparent;
         }
 
         .characteristics-section {
diff --git a/styles/less/sheets/actors/character/effects.less b/styles/less/sheets/actors/character/effects.less
index ceadd05e..ae49fa2d 100644
--- a/styles/less/sheets/actors/character/effects.less
+++ b/styles/less/sheets/actors/character/effects.less
@@ -10,9 +10,6 @@
             overflow-y: auto;
             mask-image: linear-gradient(0deg, transparent 0%, black 5%);
             padding-bottom: 20px;
-
-            scrollbar-width: thin;
-            scrollbar-color: light-dark(@dark-blue, @golden) transparent;
         }
     }
 }
diff --git a/styles/less/sheets/actors/character/features.less b/styles/less/sheets/actors/character/features.less
index 6a6438ff..017254a3 100644
--- a/styles/less/sheets/actors/character/features.less
+++ b/styles/less/sheets/actors/character/features.less
@@ -10,9 +10,6 @@
             overflow-y: auto;
             mask-image: linear-gradient(0deg, transparent 0%, black 5%);
             padding-bottom: 20px;
-
-            scrollbar-width: thin;
-            scrollbar-color: light-dark(@dark-blue, @golden) transparent;
         }
     }
 }
diff --git a/styles/less/sheets/actors/character/inventory.less b/styles/less/sheets/actors/character/inventory.less
index 12f63753..c8d2b584 100644
--- a/styles/less/sheets/actors/character/inventory.less
+++ b/styles/less/sheets/actors/character/inventory.less
@@ -10,9 +10,6 @@
             overflow-y: auto;
             mask-image: linear-gradient(0deg, transparent 0%, black 5%, black 95%, transparent 100%);
             padding: 20px 0;
-
-            scrollbar-width: thin;
-            scrollbar-color: light-dark(@dark-blue, @golden) transparent;
         }
     }
 }
diff --git a/styles/less/sheets/actors/character/loadout.less b/styles/less/sheets/actors/character/loadout.less
index eba55890..127d688a 100644
--- a/styles/less/sheets/actors/character/loadout.less
+++ b/styles/less/sheets/actors/character/loadout.less
@@ -92,9 +92,6 @@
             overflow-y: auto;
             mask-image: linear-gradient(0deg, transparent 0%, black 10%, black 98%, transparent 100%);
             padding: 20px 0;
-
-            scrollbar-width: thin;
-            scrollbar-color: light-dark(@dark-blue, @golden) transparent;
         }
     }
 }
diff --git a/styles/less/sheets/actors/character/sidebar.less b/styles/less/sheets/actors/character/sidebar.less
index 0e6e3d97..e450891b 100644
--- a/styles/less/sheets/actors/character/sidebar.less
+++ b/styles/less/sheets/actors/character/sidebar.less
@@ -551,11 +551,9 @@
         padding-bottom: 20px;
         mask-image: linear-gradient(0deg, transparent 0%, black 5%);
         scrollbar-gutter: stable;
-        scrollbar-width: thin;
-
+        
         &:hover {
             overflow-y: auto;
-            scrollbar-color: light-dark(@dark-blue, @golden) transparent;
         }
     }
 
diff --git a/styles/less/sheets/actors/companion/effects.less b/styles/less/sheets/actors/companion/effects.less
index 12e1d847..6d7fe061 100644
--- a/styles/less/sheets/actors/companion/effects.less
+++ b/styles/less/sheets/actors/companion/effects.less
@@ -9,9 +9,6 @@
             overflow-y: auto;
             mask-image: linear-gradient(0deg, transparent 0%, black 5%);
             padding-bottom: 20px;
-
-            scrollbar-width: thin;
-            scrollbar-color: light-dark(@dark-blue, @golden) transparent;
         }
     }
 }
diff --git a/styles/less/sheets/actors/environment/actions.less b/styles/less/sheets/actors/environment/actions.less
index 51385322..cc8a345a 100644
--- a/styles/less/sheets/actors/environment/actions.less
+++ b/styles/less/sheets/actors/environment/actions.less
@@ -10,9 +10,6 @@
             overflow-y: auto;
             mask-image: linear-gradient(0deg, transparent 0%, black 5%);
             padding-bottom: 20px;
-
-            scrollbar-width: thin;
-            scrollbar-color: light-dark(@dark-blue, @golden) transparent;
         }
     }
 }
diff --git a/styles/less/sheets/actors/environment/potentialAdversaries.less b/styles/less/sheets/actors/environment/potentialAdversaries.less
index 274362a5..f3c5776a 100644
--- a/styles/less/sheets/actors/environment/potentialAdversaries.less
+++ b/styles/less/sheets/actors/environment/potentialAdversaries.less
@@ -9,9 +9,6 @@
             overflow-y: auto;
             mask-image: linear-gradient(0deg, transparent 0%, black 5%);
             padding-bottom: 20px;
-
-            scrollbar-width: thin;
-            scrollbar-color: light-dark(@dark-blue, @golden) transparent;
         }
     }
 }
diff --git a/styles/less/sheets/actors/environment/sheet.less b/styles/less/sheets/actors/environment/sheet.less
index 3ea14bc7..a7c9605b 100644
--- a/styles/less/sheets/actors/environment/sheet.less
+++ b/styles/less/sheets/actors/environment/sheet.less
@@ -20,8 +20,6 @@
     .tab {
         flex: 1;
         overflow-y: auto;
-        scrollbar-width: thin;
-        scrollbar-color: light-dark(@dark-blue, @golden) transparent;
 
         &.active {
             overflow: hidden;
diff --git a/styles/less/sheets/actors/party/inventory.less b/styles/less/sheets/actors/party/inventory.less
index ac59e1de..8af37a79 100644
--- a/styles/less/sheets/actors/party/inventory.less
+++ b/styles/less/sheets/actors/party/inventory.less
@@ -10,9 +10,6 @@
             overflow-y: auto;
             mask-image: linear-gradient(0deg, transparent 0%, black 5%, black 95%, transparent 100%);
             padding: 20px 0;
-
-            scrollbar-width: thin;
-            scrollbar-color: light-dark(@dark-blue, @golden) transparent;
         }
     }
 }
diff --git a/styles/less/sheets/actors/party/sheet.less b/styles/less/sheets/actors/party/sheet.less
index 6b51de53..852b6cfc 100644
--- a/styles/less/sheets/actors/party/sheet.less
+++ b/styles/less/sheets/actors/party/sheet.less
@@ -20,8 +20,6 @@
     .tab {
         flex: 1;
         overflow-y: auto;
-        scrollbar-width: thin;
-        scrollbar-color: light-dark(@dark-blue, @golden) transparent;
         scrollbar-gutter: stable;
 
         &.active {
diff --git a/styles/less/sheets/items/domain-card.less b/styles/less/sheets/items/domain-card.less
index a784b3a2..54378fd0 100644
--- a/styles/less/sheets/items/domain-card.less
+++ b/styles/less/sheets/items/domain-card.less
@@ -5,7 +5,5 @@
     section.tab {
         height: 400px;
         overflow-y: auto;
-        scrollbar-width: thin;
-        scrollbar-color: light-dark(@dark-blue, @golden) transparent;
     }
 }
diff --git a/styles/less/sheets/items/feature.less b/styles/less/sheets/items/feature.less
index b7493f15..f3c7cd49 100644
--- a/styles/less/sheets/items/feature.less
+++ b/styles/less/sheets/items/feature.less
@@ -14,7 +14,5 @@
     section.tab {
         height: 400px;
         overflow-y: auto;
-        scrollbar-width: thin;
-        scrollbar-color: light-dark(@dark-blue, @golden) transparent;
     }
 }
diff --git a/styles/less/ui/countdown/countdown-edit.less b/styles/less/ui/countdown/countdown-edit.less
index d6c4da93..78ad3a06 100644
--- a/styles/less/ui/countdown/countdown-edit.less
+++ b/styles/less/ui/countdown/countdown-edit.less
@@ -60,8 +60,6 @@
             overflow-y: auto;
             overflow-x: hidden;
             max-height: 500px;
-            scrollbar-width: thin;
-            scrollbar-color: light-dark(@dark-blue, @golden) transparent;
 
             .countdown-edit-outer-container {
                 display: flex;
diff --git a/styles/less/ui/item-browser/item-browser.less b/styles/less/ui/item-browser/item-browser.less
index f558a0ba..1142b8fd 100644
--- a/styles/less/ui/item-browser/item-browser.less
+++ b/styles/less/ui/item-browser/item-browser.less
@@ -237,8 +237,6 @@
         .compendium-sidebar > .folder-list {
             overflow-y: auto;
             scrollbar-gutter: stable;
-            scrollbar-width: thin;
-            scrollbar-color: light-dark(@dark-blue, @golden) transparent;
         }
 
         .item-list-header,
diff --git a/styles/less/ui/settings/homebrew-settings/domains.less b/styles/less/ui/settings/homebrew-settings/domains.less
index da258fcd..406294ac 100644
--- a/styles/less/ui/settings/homebrew-settings/domains.less
+++ b/styles/less/ui/settings/homebrew-settings/domains.less
@@ -55,8 +55,6 @@
             gap: 8px;
             max-height: 184px;
             overflow: auto;
-            scrollbar-width: thin;
-            scrollbar-color: light-dark(#18162e, #f3c267) transparent;
 
             .domain-container {
                 position: relative;
diff --git a/styles/less/ux/autocomplete/autocomplete.less b/styles/less/ux/autocomplete/autocomplete.less
index 7f799449..e778f0da 100644
--- a/styles/less/ux/autocomplete/autocomplete.less
+++ b/styles/less/ux/autocomplete/autocomplete.less
@@ -21,8 +21,6 @@
     flex-direction: column;
     gap: 2px;
 
-    scrollbar-color: light-dark(@dark-blue, @golden) transparent;
-
     .group {
         font-weight: bold;
         font-size: var(--font-size-14);
diff --git a/styles/less/ux/tooltip/sheet.less b/styles/less/ux/tooltip/sheet.less
index 59e4e638..ad774fcd 100644
--- a/styles/less/ux/tooltip/sheet.less
+++ b/styles/less/ux/tooltip/sheet.less
@@ -48,9 +48,6 @@ aside[role='tooltip']:has(div.daggerheart.dh-style.tooltip),
         overflow-y: auto;
         position: relative;
 
-        scrollbar-width: thin;
-        scrollbar-color: light-dark(@dark-blue, @golden) transparent;
-
         .tooltip-tag {
             display: flex;
             gap: 10px;
diff --git a/system.json b/system.json
index 16a1f74b..7c1321fb 100644
--- a/system.json
+++ b/system.json
@@ -2,7 +2,7 @@
     "id": "daggerheart",
     "title": "Daggerheart",
     "description": "An unofficial implementation of the Daggerheart system",
-    "version": "2.2.4",
+    "version": "2.2.5",
     "compatibility": {
         "minimum": "14.359",
         "verified": "14.361",
@@ -10,11 +10,16 @@
     },
     "url": "https://github.com/Foundryborne/daggerheart",
     "manifest": "https://raw.githubusercontent.com/Foundryborne/daggerheart/v14/system.json",
-    "download": "https://github.com/Foundryborne/daggerheart/releases/download/2.2.4/system.zip",
+    "download": "https://github.com/Foundryborne/daggerheart/releases/download/2.2.5/system.zip",
     "authors": [
         {
             "name": "WBHarry"
         },
+        {
+            "name": "Supe",
+            "url": "https://github.com/CarlosFdez",
+            "discord": "supe"
+        },
         {
             "name": "cptn-cosmo",
             "url": "https://github.com/cptn-cosmo",
@@ -298,5 +303,11 @@
     },
     "background": "systems/daggerheart/assets/logos/FoundrybornBackgroundLogo.png",
     "primaryTokenAttribute": "resources.hitPoints",
-    "secondaryTokenAttribute": "resources.stress"
+    "secondaryTokenAttribute": "resources.stress",
+    "flags": {
+        "hotReload": {
+            "extensions": ["css", "hbs", "json"],
+            "paths": ["styles/daggerheart.css", "templates", "lang"]
+        }
+    }
 }
diff --git a/templates/dialogs/tagTeamDialog/initialization.hbs b/templates/dialogs/tagTeamDialog/initialization.hbs
index 7ccdf566..0b92e68e 100644
--- a/templates/dialogs/tagTeamDialog/initialization.hbs
+++ b/templates/dialogs/tagTeamDialog/initialization.hbs
@@ -1,13 +1,18 @@
 <section class="initialization-container tab {{#if tabs.initialization.active}} active{{/if}}" data-group="{{tabs.initialization.group}}" data-tab="{{tabs.initialization.id}}">
-    <h2>{{localize "DAGGERHEART.APPLICATIONS.TagTeamSelect.selectParticipants"}}</h2>
+    <h1>{{localize "DAGGERHEART.APPLICATIONS.TagTeamSelect.selectParticipants"}}</h1>
     <div class="members-container">
         {{#each memberSelection as |member|}}
             <a 
                 class="member-container {{#unless member.selected}}inactive {{#if ../allselected}}locked{{/if}}{{/unless}}" 
                 data-action="toggleSelectMember" data-id="{{member.id}}" {{#if (and (not member.selected) ../allSelected)}}disabled{{/if}}
             >
-                <span class="member-name">{{member.name}}</span>
                 <img src="{{member.img}}" />
+                <span class="member-name">{{member.name}}</span>
+                {{#if (eq @root.initiator.memberId member.id)}}
+                    <div class="leader-mark">
+                        <i class="fa-solid fa-crown" inert></i>
+                    </div>
+                {{/if}}
             </a>
         {{/each}} 
     </div>
@@ -30,10 +35,13 @@
     </div>
 
     <footer>
-        <button type="button" data-action="startTagTeamRoll" {{#unless canStartTagTeam}}disabled{{/unless}}>{{localize "DAGGERHEART.APPLICATIONS.TagTeamSelect.startTagTeamRoll"}} <i class="fa-solid fa-arrow-right-long"></i></button>
         <div class="finish-tools {{#unless canStartTagTeam}}inactive{{/unless}}">
             <span>{{localize "DAGGERHEART.APPLICATIONS.TagTeamSelect.openDialogForAll"}}</span>
             <input type="checkbox" class="openforall-field" {{#unless canStartTagTeam}}disabled{{/unless}} {{checked openForAllPlayers}} />
         </div>
+        <button type="button" data-action="startTagTeamRoll" {{#unless canStartTagTeam}}disabled{{/unless}}>
+            <i class="fa-solid fa-arrow-right-long" inert></i>
+            {{localize "DAGGERHEART.APPLICATIONS.TagTeamSelect.startTagTeamRoll"}}
+        </button>
     </footer>
 </section>
\ No newline at end of file
diff --git a/templates/dialogs/tagTeamDialog/result.hbs b/templates/dialogs/tagTeamDialog/result.hbs
index 79b5138e..151c8c87 100644
--- a/templates/dialogs/tagTeamDialog/result.hbs
+++ b/templates/dialogs/tagTeamDialog/result.hbs
@@ -32,7 +32,10 @@
 
         <div class="finish-container">
             <button type="button" data-action="cancelRoll">{{localize "DAGGERHEART.APPLICATIONS.TagTeamSelect.cancelTagTeamRoll"}}</button>
-            <button type="button" data-action="finishRoll" {{#if hintText}}disabled{{/if}} class="finish-button">{{localize "DAGGERHEART.APPLICATIONS.TagTeamSelect.finishTagTeamRoll"}}</button>
+            <button type="button" data-action="finishRoll" {{#if hintText}}disabled{{/if}} class="finish-button">
+                <i class="fa-solid fa-dice" inert></i>
+                {{localize "DAGGERHEART.APPLICATIONS.TagTeamSelect.finishTagTeamRoll"}}
+            </button>
         </div>
     </div>
 </section>
\ No newline at end of file
diff --git a/templates/levelup/tabs/selections.hbs b/templates/levelup/tabs/selections.hbs
index 7ebe32bb..deb7f6c0 100644
--- a/templates/levelup/tabs/selections.hbs
+++ b/templates/levelup/tabs/selections.hbs
@@ -43,45 +43,6 @@
             </fieldset>
         {{/if}}
 
-        {{#if (gt this.domainCards.length 0)}}
-            <div class="card-section">
-                <div class="card-section-header">
-                    <side-line-div class="invert"></side-line-div>
-                    <h3>{{localize "DAGGERHEART.APPLICATIONS.Levelup.summary.domainCards"}}</h3>
-                    <side-line-div></side-line-div>
-                </div>
-                <div class="tip">
-
-                </div>
-
-                <div class="levelup-card-selection domain-cards">
-                    {{#each this.domainCards}}
-                        {{#> "systems/daggerheart/templates/components/card-preview.hbs" this }}
-                            {{#each this.emptySubtexts}}
-                                <div class="">{{this}}</div>
-                            {{/each}}
-                        {{/"systems/daggerheart/templates/components/card-preview.hbs"}}
-                    {{/each}}
-                </div>
-            </div>
-        {{/if}}
-
-        {{#if (gt this.subclassCards.length 0)}}
-            <div class="card-section">
-                <div class="card-section-header">
-                    <side-line-div class="invert"></side-line-div>
-                    <h3>{{localize "DAGGERHEART.APPLICATIONS.Levelup.summary.subclass"}}</h3>
-                    <side-line-div></side-line-div>
-                </div>
-
-                <div class="levelup-card-selection subclass-cards">
-                    {{#each this.subclassCards}}
-                        {{> "systems/daggerheart/templates/levelup/parts/selectable-card-preview.hbs" img=this.img header=this.featureLabel name=this.name path=this.path selected=this.selected uuid=this.uuid isMulticlass=this.isMulticlass featureState=this.featureState disabled=this.disabled }}
-                    {{/each}}
-                </div>
-            </div>
-        {{/if}}
-
         {{#if this.multiclass}}
             <div class="card-section">
                 <div class="card-section-header">
@@ -128,6 +89,45 @@
             </div>
         {{/if}}
 
+        {{#if (gt this.domainCards.length 0)}}
+            <div class="card-section">
+                <div class="card-section-header">
+                    <side-line-div class="invert"></side-line-div>
+                    <h3>{{localize "DAGGERHEART.APPLICATIONS.Levelup.summary.domainCards"}}</h3>
+                    <side-line-div></side-line-div>
+                </div>
+                <div class="tip">
+
+                </div>
+
+                <div class="levelup-card-selection domain-cards">
+                    {{#each this.domainCards}}
+                        {{#> "systems/daggerheart/templates/components/card-preview.hbs" this }}
+                            {{#each this.emptySubtexts}}
+                                <div class="">{{this}}</div>
+                            {{/each}}
+                        {{/"systems/daggerheart/templates/components/card-preview.hbs"}}
+                    {{/each}}
+                </div>
+            </div>
+        {{/if}}
+
+        {{#if (gt this.subclassCards.length 0)}}
+            <div class="card-section">
+                <div class="card-section-header">
+                    <side-line-div class="invert"></side-line-div>
+                    <h3>{{localize "DAGGERHEART.APPLICATIONS.Levelup.summary.subclass"}}</h3>
+                    <side-line-div></side-line-div>
+                </div>
+
+                <div class="levelup-card-selection subclass-cards">
+                    {{#each this.subclassCards}}
+                        {{> "systems/daggerheart/templates/levelup/parts/selectable-card-preview.hbs" img=this.img header=this.featureLabel name=this.name path=this.path selected=this.selected uuid=this.uuid isMulticlass=this.isMulticlass featureState=this.featureState disabled=this.disabled }}
+                    {{/each}}
+                </div>
+            </div>
+        {{/if}}
+
         {{#if this.vicious}}
             <div>
                 <h3>{{localize "DAGGERHEART.APPLICATIONS.Levelup.summary.vicious"}}</h3>