Raised version

* Visual updates to tag team initialization

* Center players and handlet he case where is 5 or 6 players

.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/

lang/en.json

@@ -406,7 +406,11 @@
                 "giveSpotlight": "Give The Spotlight",
                 "requestingSpotlight": "Requesting The Spotlight",
                 "requestSpotlight": "Request The Spotlight",
-                "openCountdowns": "Countdowns"
+                "openCountdowns": "Countdowns",
+                "adversaryCategories": {
+                    "friendly": "Friendly",
+                    "adversaries": "Adversaries"
+                }
             },
             "CompendiumBrowserSettings": {
                 "title": "Enable Compendiums",

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,

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:
+                        subclasses: subclasses.map(subclass => ({
-                            multiclass?.system?.subclasses.map(subclass => ({
+                            ...subclass,
-                                ...subclass,
+                            uuid: subclass.uuid,
-                                uuid: subclass.uuid,
+                            selected: data.secondaryData.subclass === subclass.uuid,
-                                selected: data.secondaryData.subclass === subclass.uuid,
+                            disabled: data.secondaryData.subclass && data.secondaryData.subclass !== subclass.uuid
-                                disabled: data.secondaryData.subclass && data.secondaryData.subclass !== subclass.uuid
+                        })),
-                            })) ?? [],
                         compendium: 'classes',
                         limit: 1
                     };

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',

module/applications/ui/combatTracker.mjs

@@ -56,7 +56,9 @@ export default class DhCombatTracker extends foundry.applications.sidebar.tabs.C
     async _prepareTrackerContext(context, options) {
         await super._prepareTrackerContext(context, options);
 
-        const adversaries = context.turns?.filter(x => x.isNPC) ?? [];
+        const npcs = context.turns?.filter(x => x.isNPC) ?? [];
+        const adversaries = npcs.filter(x => x.disposition !== CONST.TOKEN_DISPOSITIONS.FRIENDLY);
+        const friendlies = npcs.filter(x => x.disposition === CONST.TOKEN_DISPOSITIONS.FRIENDLY);
         const characters = context.turns?.filter(x => !x.isNPC) ?? [];
         const spotlightQueueEnabled = game.settings.get(
             CONFIG.DH.id,
@@ -75,6 +77,7 @@ export default class DhCombatTracker extends foundry.applications.sidebar.tabs.C
         Object.assign(context, {
             actionTokens: game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.variantRules).actionTokens,
             adversaries,
+            friendlies,
             allCharacters: characters,
             characters: characters.filter(x => !spotlightQueueEnabled || x.system.spotlight.requestOrderIndex == 0),
             spotlightRequests
@@ -129,7 +132,8 @@ export default class DhCombatTracker extends foundry.applications.sidebar.tabs.C
             active: index === combat.turn,
             canPing: combatant.sceneId === canvas.scene?.id && game.user.hasPermission('PING_CANVAS'),
             type: combatant.actor?.system?.type,
-            img: await this._getCombatantThumbnail(combatant)
+            img: await this._getCombatantThumbnail(combatant),
+            disposition: combatant.token.disposition
         };
 
         turn.css = [turn.active ? 'active' : null, hidden ? 'hide' : null, isDefeated ? 'defeated' : null].filterJoin(

module/applications/ui/countdowns.mjs

@@ -21,10 +21,10 @@ export default class DhCountdowns extends HandlebarsApplicationMixin(Application
     static DEFAULT_OPTIONS = {
         id: 'countdowns',
         tag: 'div',
-        classes: ['daggerheart', 'dh-style', 'countdowns', 'faded-ui'],
+        classes: ['daggerheart', 'dh-style', 'countdowns'],
         window: {
             icon: 'fa-solid fa-clock-rotate-left',
-            frame: true,
+            frame: false,
             title: 'DAGGERHEART.UI.Countdowns.title',
             positioned: false,
             resizable: false,
@@ -62,20 +62,6 @@ export default class DhCountdowns extends HandlebarsApplicationMixin(Application
         if (iconOnly) frame.classList.add('icon-only');
         else frame.classList.remove('icon-only');
 
-        const header = frame.querySelector('.window-header');
-        header.querySelector('button[data-action="close"]').remove();
-        header.querySelector('button[data-action="toggleControls"]').remove();
-
-        if (game.user.isGM) {
-            const editTooltip = game.i18n.localize('DAGGERHEART.APPLICATIONS.CountdownEdit.editTitle');
-            const editButton = `<a style="margin-right: 8px;" class="header-control" data-tooltip="${editTooltip}" aria-label="${editTooltip}" data-action="editCountdowns"><i class="fa-solid fa-wrench"></i></a>`;
-            header.insertAdjacentHTML('beforeEnd', editButton);
-        }
-
-        const minimizeTooltip = game.i18n.localize('DAGGERHEART.UI.Countdowns.toggleIconMode');
-        const minimizeButton = `<a class="header-control" data-tooltip="${minimizeTooltip}" aria-label="${minimizeTooltip}" data-action="toggleViewMode"><i class="fa-solid fa-down-left-and-up-right-to-center"></i></a>`;
-        header.insertAdjacentHTML('beforeEnd', minimizeButton);
-
         return frame;
     }
 

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;

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 =
+        const Color = foundry.utils.Color;
-            number === 0 ? foundry.utils.Color.fromRGB([1, 0, 0]) : foundry.utils.Color.fromString('#0032b1');
+        const fillColor = number === 0 ? Color.fromRGB([1, 0, 0]) : Color.fromString('#0032b1');
+        const emptyColor = Color.fromRGB([0, 0, 0]);
 
-        // Draw the bar
+        // Draw the bar (accounting floating point numbers from bar animations)
-        const widthUnit = bw / data.max;
+        const widthUnit = bw / Math.ceil(data.max);
         bar.clear().lineStyle(s, 0x000000, 1.0);
-        const sections = [...Array(data.max).keys()];
+        const sections = [...Array(Math.ceil(data.max)).keys()];
-        for (let mark of sections) {
+        for (const mark of sections) {
             const x = mark * widthUnit;
-            const marked = mark + 1 <= data.value;
+            const marked = mark < Math.ceil(data.value);
-            const color = marked ? fillColor : foundry.utils.Color.fromRGB([0, 0, 0]);
+            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 {

module/documents/tooltipManager.mjs

@@ -350,7 +350,9 @@ export default class DhTooltipManager extends foundry.helpers.interaction.Toolti
     async getBattlepointHTML(combatId) {
         const combat = game.combats.get(combatId);
         const adversaries =
-            combat.turns?.filter(x => x.actor?.isNPC)?.map(x => ({ ...x.actor, type: x.actor.system.type })) ?? [];
+            combat.turns
+                ?.filter(x => x.actor?.isNPC && x.token.disposition === CONST.TOKEN_DISPOSITIONS.HOSTILE)
+                ?.map(x => ({ ...x.actor, type: x.actor.system.type })) ?? [];
         const characters = combat.turns?.filter(x => !x.isNPC && x.actor) ?? [];
 
         const nrCharacters = characters.length;

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);
             }
 

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: 700 var(--font-size-24) var(--dh-font-subtitle);
-    font-size: var(--font-size-24);
     text-align: center;
-    font-weight: 700;
 }
 
 header {

styles/less/dialog/index.less

@@ -1,10 +1,5 @@
 @import './attribution/sheet.less';
-@import './level-up/navigation-container.less';
+@import './level-up/index.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 './resource-dice/sheet.less';
 

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';

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;
+                display: grid;
-                flex-direction: column;
+                grid-auto-flow: column;
-                gap: 8px;
+                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;
+                        padding: 2px 12px;
-                        border-radius: 6px;
                         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;
+                        height: 40px;
-                        width: 54px;
+                        width: 40px;
                         border-radius: 50%;
-                        border: 2px solid;
+                        border: 2px solid @golden;
-                        font-size: var(--font-size-48);
+                        font-size: var(--font-size-24);
                         display: flex;
                         align-items: center;
                         justify-content: center;
-                        background-image: url(../assets/parchments/dh-parchment-light.png);
+                        background: @dark-golden;
-                        color: var(--color-dark-5);
+                        color: @golden;
-                        top: calc(50% - 29px);
+                        top: 10px;
+                        z-index: 2;
 
                         i {
                             position: relative;

styles/less/dialog/level-up/sheet.less

@@ -11,9 +11,11 @@
 });
 
 .daggerheart.levelup {
-    .window-content {
+    .tab.active {
-        max-height: 960px;
+        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 {
-        .section-container {
+        display: flex;
-            display: flex;
+        flex-direction: row;
-            flex-direction: row;
+        justify-content: center;
-            justify-content: center;
+        gap: 20px 8px;
-            gap: 20px 8px;
+        margin-top: 8px;
-            margin-top: 8px;
+        flex-wrap: wrap;
-            flex-wrap: wrap;
-        }
     }
 
     .levelup-footer {

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%);
 

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;
+            display: flex;
-            grid-template-columns: 1fr 1fr 1fr 1fr;
+            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;
+                    bottom: 0;
-                    border: 1px solid;
+                    left: 0;
-                    border-radius: 6px;
+                    right: 0;
-                    margin-top: 4px;
+
-                    color: light-dark(@dark, @beige);
+                    display: flex;
-                    background-image: url('../assets/parchments/dh-parchment-dark.png');
+                    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;
+                    object-fit: cover;
-                    border: 1px solid light-dark(@dark-blue, @golden);
+                    object-position: top center;
+                    flex: 1;
+                }
+
+                .leader-mark {
+                    position: absolute;
+                    top: 4px;
+                    right: 4px;
+                    text-shadow: var(--shadow-text-stroke), 0 0 20px black;
                 }
             }
         }

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;

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)) {
@@ -269,6 +267,7 @@
                 border-radius: 3px;
                 background-color: light-dark(@dark-blue, @golden);
                 color: light-dark(@beige, @dark-blue);
+                margin-bottom: var(--spacer-4);
             }
         }
 
@@ -803,6 +802,7 @@
 
         .preview-image-container {
             width: 100%;
+            min-height: 0;
             flex-grow: 1;
             object-fit: cover;
             border-radius: 4px 4px 0 0;

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;

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;

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);
             }

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%;

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%;

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%;

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;
         }
     }
 }

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;
         }
     }
 }

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;
             }
         }
 

styles/less/sheets/actors/character/biography.less

@@ -9,12 +9,15 @@
             gap: 10px;
             height: 100%;
             overflow-y: auto;
-            mask-image: linear-gradient(0deg, transparent 0%, black 10%, black 98%, transparent 100%);
+            mask-image: linear-gradient(0deg, transparent 0%, black 5%, black 98%, transparent 100%);
-            padding-bottom: 10px;
+            padding-top: 8px;
+            padding-bottom: 20px;
             height: 100%;
+        }
 
-            scrollbar-width: thin;
+        .characteristics-section {
-            scrollbar-color: light-dark(@dark-blue, @golden) transparent;
+            gap: 20px;
+            padding: 0 10px;
         }
 
         .biography-section {

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;
         }
     }
 }

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;
         }
     }
 }

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;
         }
     }
 }

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;
         }
     }
 }

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;
         }
     }
 

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;
         }
     }
 }

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;
         }
     }
 }

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;
         }
     }
 }

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;

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;
         }
     }
 }

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 {

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;
     }
 }

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;
     }
 }

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;

styles/less/ui/countdown/countdown.less

@@ -1,28 +1,47 @@
 @import '../../utils/colors.less';
 @import '../../utils/fonts.less';
 
-.theme-dark {
+#interface.theme-dark {
     .daggerheart.dh-style.countdowns {
-        background-image: url(../assets/parchments/dh-parchment-dark.png);
+        --background: url(../assets/parchments/dh-parchment-dark.png);
-
-        .window-header {
-            background-image: url(../assets/parchments/dh-parchment-dark.png);
-        }
     }
 }
 
-.daggerheart.dh-style.countdowns {
+#interface.theme-light {
+    .daggerheart.dh-style.countdowns {
+        --background: url('../assets/parchments/dh-parchment-light.png') no-repeat center;
+    }
+}
+
+.daggerheart.dh-style.countdowns {    
     position: relative;
     border: 0;
-    border-radius: 4px;
     box-shadow: none;
+    color: var(--color-text-primary);
     width: 300px;
     pointer-events: all;
     align-self: flex-end;
     transition: 0.3s right ease-in-out;
 
-    .window-title {
+    display: flex;
-        font-family: @font-body;
+    flex-direction: column;
+
+    &::before {
+        content: ' ';
+        position: absolute;
+        inset: 0;
+        background: var(--background);
+        border-radius: 4px;
+        opacity: var(--ui-fade-opacity);
+        transition: opacity var(--ui-fade-duration);
+    }
+
+    :not(.performance-low, .noblur) {
+        backdrop-filter: blur(5px);
+    }
+
+    &:hover::before {
+        opacity: 1;
     }
 
     #ui-right:has(#effects-display .effect-container) & {
@@ -34,123 +53,136 @@
         min-width: 180px;
     }
 
-    .window-header {
+    .countdowns-header,
-        cursor: default;
+    .countdowns-container {
-        border-bottom: 0;
+        position: relative; // allow rendering over the background
     }
 
-    .window-content {
+    .countdowns-header {
-        padding-top: 4px;
+        display: flex;
-        padding-bottom: 16px;
+        align-items: center;
+        gap: 0.25rem;
+        flex: 0 0 36px;
+        padding: 0 0.5rem;
+        overflow: hidden;
+        font-size: var(--font-size-13);
+        .window-title {
+            font-family: @font-body;
+            flex: 1;
+        }
+        .header-control + .header-control {
+            margin-left: 8px;
+        }
+    }
+
+    .countdowns-container {
+        display: flex;
+        flex-direction: column;
+        gap: 8px;
+        padding: 4px var(--spacer-16) var(--spacer-16) var(--spacer-16);
         overflow: auto;
         max-height: 312px;
 
-        .countdowns-container {
+        .countdown-container {
             display: flex;
-            flex-direction: column;
+            width: 100%;
-            gap: 8px;
 
-            .countdown-container {
+            &.icon-only {
-                display: flex;
+                gap: 8px;
-                width: 100%;
 
-                &.icon-only {
+                .countdown-main-container {
-                    gap: 8px;
+                    .countdown-content {
+                        justify-content: center;
 
-                    .countdown-main-container {
+                        .countdown-tools {
-                        .countdown-content {
+                            gap: 8px;
-                            justify-content: center;
-
-                            .countdown-tools {
-                                gap: 8px;
-                            }
                         }
                     }
                 }
+            }
 
-                .countdown-main-container {
+            .countdown-main-container {
-                    width: 100%;
+                width: 100%;
+                display: flex;
+                align-items: center;
+                gap: 16px;
+
+                img {
+                    width: 44px;
+                    height: 44px;
+                    border-radius: 6px;
+                }
+
+                .countdown-content {
+                    flex: 1;
                     display: flex;
-                    align-items: center;
+                    flex-direction: column;
-                    gap: 16px;
+                    justify-content: space-between;
 
-                    img {
+                    .countdown-tools {
-                        width: 44px;
-                        height: 44px;
-                        border-radius: 6px;
-                    }
-
-                    .countdown-content {
-                        flex: 1;
                         display: flex;
-                        flex-direction: column;
+                        align-items: center;
                         justify-content: space-between;
 
-                        .countdown-tools {
+                        .countdown-tool-controls {
                             display: flex;
                             align-items: center;
-                            justify-content: space-between;
+                            gap: 16px;
+                        }
 
-                            .countdown-tool-controls {
+                        .progress-tag {
-                                display: flex;
+                            border: 1px solid;
-                                align-items: center;
+                            border-radius: 4px;
-                                gap: 16px;
+                            padding: 2px 4px;
-                            }
+                            background-color: light-dark(@beige, @dark-blue);
+                        }
 
-                            .progress-tag {
+                        .countdown-tool-icons {
-                                border: 1px solid;
+                            display: flex;
-                                border-radius: 4px;
+                            align-items: center;
+                            gap: 8px;
+
+                            .looping-container {
+                                position: relative;
+                                border: 1px solid light-dark(@dark-blue, white);
+                                border-radius: 6px;
                                 padding: 2px 4px;
-                                background-color: light-dark(@beige, @dark-blue);
-                            }
 
-                            .countdown-tool-icons {
+                                &.should-loop {
-                                display: flex;
+                                    background: light-dark(@golden, @golden);
-                                align-items: center;
-                                gap: 8px;
 
-                                .looping-container {
+                                    .loop-marker {
-                                    position: relative;
+                                        color: light-dark(@dark-blue, @dark-blue);
-                                    border: 1px solid light-dark(@dark-blue, white);
-                                    border-radius: 6px;
-                                    padding: 2px 4px;
-
-                                    &.should-loop {
-                                        background: light-dark(@golden, @golden);
-
-                                        .loop-marker {
-                                            color: light-dark(@dark-blue, @dark-blue);
-                                        }
                                     }
+                                }
 
-                                    .direction-marker {
+                                .direction-marker {
-                                        position: absolute;
+                                    position: absolute;
-                                        font-size: 10px;
+                                    font-size: 10px;
-                                        filter: drop-shadow(0 0 3px black);
+                                    filter: drop-shadow(0 0 3px black);
-                                        top: -3px;
+                                    top: -3px;
-                                    }
                                 }
                             }
                         }
                     }
                 }
-                /* Keep incase we want to reintroduce the player pips */
-                // .countdown-access-container {
-                //     display: grid;
-                //     grid-template-columns: 1fr 1fr 1fr;
-                //     grid-auto-rows: min-content;
-                //     width: 38px;
-                //     gap: 4px;
-
-                //     .countdown-access {
-                //         height: 10px;
-                //         width: 10px;
-                //         border-radius: 50%;
-                //         border: 1px solid light-dark(@dark-blue, @beige-80);
-                //         content: '';
-                //     }
-                // }
             }
+            /* Keep incase we want to reintroduce the player pips */
+            // .countdown-access-container {
+            //     display: grid;
+            //     grid-template-columns: 1fr 1fr 1fr;
+            //     grid-auto-rows: min-content;
+            //     width: 38px;
+            //     gap: 4px;
+
+            //     .countdown-access {
+            //         height: 10px;
+            //         width: 10px;
+            //         border-radius: 50%;
+            //         border: 1px solid light-dark(@dark-blue, @beige-80);
+            //         content: '';
+            //     }
+            // }
         }
     }
 }

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,

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;

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);

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;

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"]
+        }
+    }
 }

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>

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>

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>

templates/sheets/actors/character/biography.hbs

@@ -4,9 +4,7 @@
     data-group='{{tabs.biography.group}}'
 >
     <div class="items-section">
-        <fieldset class="flex">
+        <div class="characteristics-section flexrow">
-            <legend>{{localize 'DAGGERHEART.ACTORS.Character.story.characteristics'}}</legend>
-            
             <div class="input">
                 <span>{{localize 'DAGGERHEART.ACTORS.Character.pronouns'}}</span>
                 {{formInput systemFields.biography.fields.characteristics.fields.pronouns value=source.system.biography.characteristics.pronouns enriched=source.system.biography.characteristics.pronouns localize=true toggled=true}}
@@ -21,14 +19,14 @@
                 <span>{{localize 'DAGGERHEART.ACTORS.Character.faith'}}</span>
                 {{formInput systemFields.biography.fields.characteristics.fields.faith value=source.system.biography.characteristics.faith enriched=source.system.biography.characteristics.faith localize=true toggled=true}}
             </div>
-        </fieldset>
+        </div>
 
-        <fieldset class="biography-section">
+        <fieldset class="glassy biography-section">
             <legend>{{localize 'DAGGERHEART.ACTORS.Character.story.backgroundTitle'}}</legend>
             {{formInput background.field value=background.value enriched=background.enriched toggled=true}}
         </fieldset>
 
-        <fieldset class="biography-section">
+        <fieldset class="glassy biography-section">
             <legend>{{localize 'DAGGERHEART.ACTORS.Character.story.connectionsTitle'}}</legend>
             {{formInput connections.field value=connections.value enriched=connections.enriched toggled=true}}
         </fieldset>

templates/sheets/actors/character/features.hbs

@@ -2,26 +2,25 @@
     data-group='{{tabs.features.group}}'>
     <div class="features-sections">
         {{#each document.system.sheetLists as |category|}}
-        {{#if (eq category.type 'feature' )}}
+            {{#if (eq category.type 'feature' )}}
-        {{> 'daggerheart.inventory-items'
+                {{> 'daggerheart.inventory-items'
-            title=category.title
+                    title=category.title
-            type='feature'
+                    type='feature'
-            actorType='character'
+                    actorType='character'
-            collection=category.values
+                    collection=category.values
-            canCreate=@root.editable
+                    canCreate=@root.editable
-            showActions=@root.editable
+                    showActions=@root.editable
-        }}
+                }}
-        {{else if category.values}}
+                {{else if category.values}}
-        {{> 'daggerheart.inventory-items'
+                {{> 'daggerheart.inventory-items'
-            title=category.title
+                    title=category.title
-            type='feature'
+                    type='feature'
-            actorType='character'
+                    actorType='character'
-            collection=category.values
+                    collection=category.values
-            canCreate=false
+                    canCreate=false
-            showActions=@root.editable
+                    showActions=@root.editable
-        }}
+                }}
-
+            {{/if}}
-        {{/if}}
         {{/each}}
     </div>
 </section>

templates/ui/combatTracker/combatTracker.hbs

@@ -5,7 +5,10 @@
     {{#if (gt this.characters.length 0)}}
         {{> 'systems/daggerheart/templates/ui/combatTracker/combatTrackerSection.hbs' this title=(localize "DAGGERHEART.GENERAL.Character.plural") turns=this.characters}}
     {{/if}}
+    {{#if (gt this.friendlies.length 0)}}
+        {{> 'systems/daggerheart/templates/ui/combatTracker/combatTrackerSection.hbs' this title=(localize "DAGGERHEART.APPLICATIONS.CombatTracker.adversaryCategories.friendly") turns=this.friendlies}}
+    {{/if}}
     {{#if (gt this.adversaries.length 0)}}
-        {{> 'systems/daggerheart/templates/ui/combatTracker/combatTrackerSection.hbs' this title=(localize "DAGGERHEART.GENERAL.Adversary.plural") turns=this.adversaries}}
+        {{> 'systems/daggerheart/templates/ui/combatTracker/combatTrackerSection.hbs' this title=(localize "DAGGERHEART.APPLICATIONS.CombatTracker.adversaryCategories.adversaries") turns=this.adversaries}}
     {{/if}}
 </div>

templates/ui/countdowns.hbs

@@ -1,4 +1,14 @@
 <div>
+    <header class="countdowns-header">
+        <i class="fa-solid fa-clock-rotate-left" inert></i>
+        <span class="window-title">{{localize "DAGGERHEART.UI.Countdowns.title"}}</span>
+        <a class="header-control" data-tooltip aria-label="DAGGERHEART.APPLICATIONS.CountdownEdit.editTitle" data-action="editCountdowns">
+            <i class="fa-solid fa-wrench" inert></i>
+        </a>
+        <a class="header-control" data-tooltip aria-label="DAGGERHEART.UI.Countdowns.toggleIconMode" data-action="toggleViewMode">
+            <i class="fa-solid fa-down-left-and-up-right-to-center" inert></i>
+        </a>
+    </header>
     <div class="countdowns-container">
         {{#each countdowns as | countdown id |}}
             <div class="countdown-container {{#if ../iconOnly}}icon-only{{/if}}">