diff --git a/apps/frontend/components/home/table/row/HomeTableRowProgress.svelte b/apps/frontend/components/home/table/row/HomeTableRowProgress.svelte
index 94841f206..f7edad5b5 100644
--- a/apps/frontend/components/home/table/row/HomeTableRowProgress.svelte
+++ b/apps/frontend/components/home/table/row/HomeTableRowProgress.svelte
@@ -34,10 +34,10 @@
                     propsFunc: () => ({
                         datas: data.datas,
                         descriptionText: data.descriptionText,
-                        haveIndexes: data.haveIndexes,
                         iconOverride: data.icon,
                         nameOverride: data.nameOverride,
                         showCurrencies: [] as number[],
+                        statuses: data.statuses,
                         character,
                         group,
                     }),
diff --git a/apps/frontend/components/items/guild-banks/Tab.svelte b/apps/frontend/components/items/guild-banks/Tab.svelte
index 65f8c8647..dfeb68ef0 100644
--- a/apps/frontend/components/items/guild-banks/Tab.svelte
+++ b/apps/frontend/components/items/guild-banks/Tab.svelte
@@ -26,14 +26,14 @@
 
 <style lang="scss">
     .collection-v2-section {
-        width: calc((46px * 14) + (0.04rem * 13) + (0.75rem * 2));
+        width: calc((48px * 14) + (0.04rem * 13) + (0.75rem * 2));
     }
     .collection-objects {
         --item-empty-border: var(--border-color);
 
         flex-flow: column wrap;
         gap: 0.04rem;
-        height: calc((46px * 7) + (0.04rem * 6));
+        height: calc((48px * 7) + (0.04rem * 6));
     }
 </style>
 
diff --git a/apps/frontend/components/progress/ProgressTableBody.svelte b/apps/frontend/components/progress/ProgressTableBody.svelte
index f66505306..80a8862f2 100644
--- a/apps/frontend/components/progress/ProgressTableBody.svelte
+++ b/apps/frontend/components/progress/ProgressTableBody.svelte
@@ -46,10 +46,10 @@
             propsFunc: () => ({
                 datas: progressData.datas,
                 descriptionText: progressData.descriptionText,
-                haveIndexes: progressData.haveIndexes,
                 iconOverride: progressData.icon,
                 nameOverride: progressData.nameOverride,
                 showCurrencies: [progressData.showCurrency],
+                statuses: progressData.statuses,
                 character,
                 group,
             }),
diff --git a/apps/frontend/components/tooltips/progress/TooltipProgress.svelte b/apps/frontend/components/tooltips/progress/TooltipProgress.svelte
index 537862bdd..3f6e39903 100644
--- a/apps/frontend/components/tooltips/progress/TooltipProgress.svelte
+++ b/apps/frontend/components/tooltips/progress/TooltipProgress.svelte
@@ -1,31 +1,46 @@
 <script lang="ts">
-    import { covenantFeatureCost } from '@/data/covenant';
+    // import { covenantFeatureCost } from '@/data/covenant';
     import { Faction } from '@/enums/faction';
     import { ProgressDataType } from '@/enums/progress-data-type';
-    import { wowthingData } from '@/shared/stores/data';
-    import { userAchievementStore } from '@/stores';
+    import { QuestStatus } from '@/enums/quest-status';
+    // import { wowthingData } from '@/shared/stores/data';
+    // import { userAchievementStore } from '@/stores';
     import { getNameForFaction } from '@/utils/get-name-for-faction';
-    import type { Character } from '@/types';
     import type { ManualDataProgressData, ManualDataProgressGroup } from '@/types/data/manual';
+    import type { CharacterProps } from '@/types/props';
 
     import ParsedText from '@/shared/components/parsed-text/ParsedText.svelte';
+    import QuestStatusIcon from '@/shared/components/icons/QuestStatusIcon.svelte';
     import WowthingImage from '@/shared/components/images/sources/WowthingImage.svelte';
-    import YesNoIcon from '@/shared/components/icons/YesNoIcon.svelte';
-
-    export let character: Character;
-    export let datas: ManualDataProgressData[];
-    export let descriptionText: Record<number, string>;
-    export let group: ManualDataProgressGroup;
-    export let haveIndexes: number[];
-    export let iconOverride: string;
-    export let nameOverride: Record<number, string>;
-    export let showCurrencies: number[] = [];
-
-    let cls: string;
-    let dataChunks: [ManualDataProgressData, number][][];
-    $: {
-        cls = (datas || []).some((data, i) => {
-            const desc = descriptionText[i] || data.description;
+
+    type Props = CharacterProps & {
+        datas: ManualDataProgressData[];
+        descriptionText: Record<number, string>;
+        group: ManualDataProgressGroup;
+        iconOverride: string;
+        nameOverride: Record<number, string>;
+        statuses: QuestStatus[];
+        showCurrencies?: number[];
+    };
+
+    let {
+        character,
+        datas,
+        descriptionText: initialDescriptionText,
+        group,
+        iconOverride,
+        nameOverride,
+        statuses,
+        showCurrencies = [],
+    }: Props = $props();
+
+    let [cls, dataChunks, descriptionText] = $derived.by(() => {
+        let retCls: string;
+        let retDataChunks: [ManualDataProgressData, number][][] = [[]];
+        let retDescriptionText = initialDescriptionText;
+
+        retCls = (datas || []).some((data, i) => {
+            const desc = initialDescriptionText[i] || data.description;
             if (desc && desc.length > 20) {
                 return true;
             }
@@ -34,73 +49,76 @@
             : 'short';
 
         // Special cases
-        if (group.name === 'Valorous Appearances') {
-            const cheev = wowthingData.achievements.achievementById.get(datas[1].ids[0]);
-            const rootTree = wowthingData.achievements.criteriaTreeById.get(cheev.criteriaTreeId);
-            const charCheev = $userAchievementStore.addonAchievements[character.id]?.[cheev.id];
-            const newDesc = { ...descriptionText };
-            if (charCheev?.earned !== true) {
-                for (let childIndex = 0; childIndex < rootTree.children.length; childIndex++) {
-                    const childTree = wowthingData.achievements.criteriaTreeById.get(
-                        rootTree.children[childIndex]
-                    );
-                    newDesc[1] += `<br>${charCheev?.criteria?.[childIndex] > 0 ? '✔' : '❌'} ${childTree.description}`;
-                }
-            }
-            descriptionText = newDesc;
-        } else if (datas.length === 1 && datas[0].type === ProgressDataType.SlCovenant) {
-            const currentRank = parseInt(descriptionText[0].split(' ')[1].split('/')[0]);
-            const isSpecial = datas[0].value === 4;
-            const prices = covenantFeatureCost[datas[0].value];
-
-            const newDatas: ManualDataProgressData[] = [];
-            const newDescriptionText: Record<number, string> = {};
-            const newHaveIndexes: number[] = [];
-
-            for (let rank = 1; rank <= (isSpecial ? 5 : 3); rank++) {
-                newDatas.push({
-                    ...datas[0],
-                    name: `Rank ${rank}`,
-                });
-
-                newDescriptionText[rank - 1] =
-                    `{priceShort:${prices[rank - 1][0]}|1810}&nbsp;&nbsp;{priceShort:${prices[rank - 1][1]}|1813}`;
-
-                if (currentRank >= rank) {
-                    newHaveIndexes.push(rank - 1);
-                }
-            }
-
-            cls = 'short';
-            datas = newDatas;
-            descriptionText = newDescriptionText;
-            haveIndexes = newHaveIndexes;
-            showCurrencies = [1810, 1813];
-        } else {
-            showCurrencies = group.currencies || [];
-        }
+        // TODO: fix this better elsewhere
+        // if (group.name === 'Valorous Appearances') {
+        //     const cheev = wowthingData.achievements.achievementById.get(datas[1].ids[0]);
+        //     const rootTree = wowthingData.achievements.criteriaTreeById.get(cheev.criteriaTreeId);
+        //     const charCheev = $userAchievementStore.addonAchievements[character.id]?.[cheev.id];
+        //     const newDesc = { ...initialDescriptionText };
+        //     if (charCheev?.earned !== true) {
+        //         for (let childIndex = 0; childIndex < rootTree.children.length; childIndex++) {
+        //             const childTree = wowthingData.achievements.criteriaTreeById.get(
+        //                 rootTree.children[childIndex]
+        //             );
+        //             newDesc[1] += `<br>${charCheev?.criteria?.[childIndex] > 0 ? '✔' : '❌'} ${childTree.description}`;
+        //         }
+        //     }
+        //     retDescriptionText = newDesc;
+        // } else if (datas.length === 1 && datas[0].type === ProgressDataType.SlCovenant) {
+        //     const currentRank = parseInt(initialDescriptionText[0].split(' ')[1].split('/')[0]);
+        //     const isSpecial = datas[0].value === 4;
+        //     const prices = covenantFeatureCost[datas[0].value];
+
+        //     const newDatas: ManualDataProgressData[] = [];
+        //     const newDescriptionText: Record<number, string> = {};
+        //     const newHaveIndexes: number[] = [];
+
+        //     for (let rank = 1; rank <= (isSpecial ? 5 : 3); rank++) {
+        //         newDatas.push({
+        //             ...datas[0],
+        //             name: `Rank ${rank}`,
+        //         });
+
+        //         newDescriptionText[rank - 1] =
+        //             `{priceShort:${prices[rank - 1][0]}|1810}&nbsp;&nbsp;{priceShort:${prices[rank - 1][1]}|1813}`;
+
+        //         if (currentRank >= rank) {
+        //             newHaveIndexes.push(rank - 1);
+        //         }
+        //     }
+
+        //     retCls = 'short';
+        //     datas = newDatas;
+        //     retDescriptionText = newDescriptionText;
+        //     haveIndexes = newHaveIndexes;
+        //     showCurrencies = [1810, 1813];
+        // } else {
+        //     showCurrencies = group.currencies || [];
+        // }
 
         // Split data
-        dataChunks = [[]];
         for (let dataIndex = 0; dataIndex < datas.length; dataIndex++) {
             const data = datas[dataIndex];
             if (data.name === 'separator') {
-                dataChunks.push([]);
+                retDataChunks.push([]);
                 continue;
             }
 
-            dataChunks[dataChunks.length - 1].push([data, dataIndex]);
+            retDataChunks[retDataChunks.length - 1].push([data, dataIndex]);
         }
 
         // if (group.name.startsWith('Sojourner')) {
         //     console.log({group, dataChunks, descriptionText, haveIndexes, nameOverride});
         // }
-    }
 
-    $: groupName =
+        return [retCls, retDataChunks, retDescriptionText];
+    });
+
+    let groupName = $derived(
         group.lookup === 'faction'
             ? `:${Faction[character.faction].toLocaleLowerCase()}: ${getNameForFaction(group.name, character.faction)}`
-            : group.name;
+            : group.name
+    );
 </script>
 
 <style lang="scss">
@@ -153,21 +171,19 @@
             <tbody>
                 {#each dataChunk as [data, dataIndex]}
                     {@const description = descriptionText[dataIndex] || data.description}
+                    {@const status = statuses[dataIndex]}
                     <tr>
                         <td class="progress">
                             {#if iconOverride}
                                 <WowthingImage name={iconOverride} size={20} border={1} />
                             {:else}
-                                <YesNoIcon
-                                    state={haveIndexes.indexOf(dataIndex) >= 0}
-                                    useStatusColors={true}
-                                />
+                                <QuestStatusIcon {status} useStatusColors={true} />
                             {/if}
                         </td>
                         <td class="name">
                             <ParsedText text={nameOverride[dataIndex] || data.name} />
 
-                            {#if description && (haveIndexes.indexOf(dataIndex) === -1 || group.type === 'dragon-racing' || datas[0].type === ProgressDataType.GarrisonTree)}
+                            {#if description && (status !== QuestStatus.Completed || group.type === 'dragon-racing' || datas[0].type === ProgressDataType.GarrisonTree)}
                                 {#if cls === 'short'}&ndash;{/if}
                                 <ParsedText cls="description-{cls}" text={description} />
                             {/if}
diff --git a/apps/frontend/components/tooltips/vault-world/TooltipVaultWorld.svelte b/apps/frontend/components/tooltips/vault-world/TooltipVaultWorld.svelte
index 5c6ebae44..df01736a8 100644
--- a/apps/frontend/components/tooltips/vault-world/TooltipVaultWorld.svelte
+++ b/apps/frontend/components/tooltips/vault-world/TooltipVaultWorld.svelte
@@ -82,6 +82,8 @@
         251: 'Hard Prey',
         252: 'Nightmare Prey',
         258: 'Purging the Vaults',
+        259: 'Labyrinth',
+        263: 'Labyrinth Boss',
     };
 
     function getRunCount(index: number): number {
diff --git a/apps/frontend/data/currencies.ts b/apps/frontend/data/currencies.ts
index a2875262a..536f5dbcf 100644
--- a/apps/frontend/data/currencies.ts
+++ b/apps/frontend/data/currencies.ts
@@ -448,6 +448,9 @@ export const currencyItems: Record<number, number[]> = {
         246951, // Stormarion Core
         null,
         267051, // Dark Particle
+        null,
+        285801, // Heroic Soul Fragment
+        285065, // Mythical Soul Fragment
     ],
     // Midnight - Zones
     283: [
diff --git a/apps/frontend/data/tasks/07-battle-for-azeroth/nazjatar.ts b/apps/frontend/data/tasks/07-battle-for-azeroth/nazjatar.ts
index de133da8e..bb5801206 100644
--- a/apps/frontend/data/tasks/07-battle-for-azeroth/nazjatar.ts
+++ b/apps/frontend/data/tasks/07-battle-for-azeroth/nazjatar.ts
@@ -13,6 +13,8 @@ export const bfaNazjatar: Task = {
             name: 'Friend',
             icon: iconLibrary.gameGoblinHead,
             alwaysStarted: true,
+            questReset: DbResetType.Daily,
+            questResetForced: true,
             subChores: [
                 {
                     key: 'choose',
@@ -50,6 +52,7 @@ export const bfaNazjatar: Task = {
             icon: iconLibrary.gameTreeFace,
             alwaysStarted: true,
             questReset: DbResetType.Weekly,
+            questResetForced: true,
             questIds: [57140],
         },
         {
@@ -57,6 +60,7 @@ export const bfaNazjatar: Task = {
             name: 'Laboritory of Mardivas',
             icon: iconLibrary.gameFizzingFlask,
             questReset: DbResetType.Weekly,
+            questResetForced: true,
             questIds: [55121],
         },
         {
@@ -64,6 +68,7 @@ export const bfaNazjatar: Task = {
             name: 'World Boss',
             icon: iconLibrary.gameSpikedDragonHead,
             questReset: DbResetType.Weekly,
+            questResetForced: true,
             questIds: [
                 56056, // Wekemara
                 56057, // Ulmath, the Soulbinder
diff --git a/apps/frontend/data/tasks/11-midnight/12-0.ts b/apps/frontend/data/tasks/11-midnight/12-0.ts
index 9f91dac10..5646899d7 100644
--- a/apps/frontend/data/tasks/11-midnight/12-0.ts
+++ b/apps/frontend/data/tasks/11-midnight/12-0.ts
@@ -94,6 +94,7 @@ export const midChores12_0: Task = {
             name: 'Hope/Unity',
             icon: aliasedIcons.planet,
             questReset: DbResetType.Custom,
+            questResetForced: true,
             showQuestName: true,
             sumObjectives: true,
             customExpiryFunc: (char, scannedAt) => customResetPeriod(char, scannedAt, 1079, 2),
diff --git a/apps/frontend/data/tasks/11-midnight/12-1.ts b/apps/frontend/data/tasks/11-midnight/12-1.ts
index 3eb418659..e357876ef 100644
--- a/apps/frontend/data/tasks/11-midnight/12-1.ts
+++ b/apps/frontend/data/tasks/11-midnight/12-1.ts
@@ -44,6 +44,7 @@ export const midChores12_1: Task = {
             icon: iconLibrary.mdiFootPrint,
             minimumLevel: 90,
             questReset: DbResetType.Custom,
+            questResetForced: true,
             questIds: [98172],
             customExpiryFunc: (char, scannedAt) => customResetPeriod(char, scannedAt, 1078, 2),
             decorationFunc: twoWeekDecorator,
diff --git a/apps/frontend/utils/get-progress.ts b/apps/frontend/utils/get-progress.ts
index 1ca650abe..1b73cb728 100644
--- a/apps/frontend/utils/get-progress.ts
+++ b/apps/frontend/utils/get-progress.ts
@@ -19,6 +19,20 @@ import type {
     ManualDataProgressGroup,
 } from '@/types/data/manual';
 
+export interface ProgressInfo {
+    datas: ManualDataProgressData[];
+    descriptionText: Record<number, string>;
+    have: number;
+    icon: string;
+    inProgress: number;
+    missingRequired: boolean;
+    nameOverride: Record<number, string>;
+    showCurrency: number;
+    showReputation: number;
+    statuses: QuestStatus[];
+    total: number;
+}
+
 export default function getProgress(
     character: Character,
     category: ManualDataProgressCategory,
@@ -34,8 +48,8 @@ export default function getProgress(
     const showReputation = 0;
 
     let datas: ManualDataProgressData[];
+    let statuses: QuestStatus[] = [];
     const descriptionText: Record<number, string> = {};
-    const haveIndexes: number[] = [];
     const nameOverride: Record<number, string> = {};
 
     const characterRace = wowthingData.static.characterRaceById.get(character.raceId);
@@ -181,7 +195,10 @@ export default function getProgress(
                 ).length;
             }
 
+            statuses = datas.map(() => QuestStatus.NotStarted);
             for (let dataIndex = 0; dataIndex < datas.length; dataIndex++) {
+                let status = QuestStatus.NotStarted;
+
                 const data = datas[dataIndex];
                 if (data.name === 'separator') {
                     continue;
@@ -200,22 +217,25 @@ export default function getProgress(
                             checkCharacterQuestIds(character.id, data.ids)) ||
                         (group.type === 'accountQuest' && checkAccountQuestIds(data.ids));
 
+                    const progressQuest = userState.quests.characterById
+                        .get(character.id)
+                        ?.progressQuestByKey?.get(`q${data.ids[0]}`);
+
+                    if (progressQuest) {
+                        status = QuestStatus.InProgress;
+                    }
+
+                    // `inProgress` isn't well named, it's really "completed but not turned in"
                     if (group.name === 'Delves') {
-                        const progressQuest = userState.quests.characterById
-                            .get(character.id)
-                            ?.progressQuestByKey?.get(`q${data.ids[0]}`);
                         if (
                             progressQuest &&
                             progressQuest.objectives[0] &&
                             progressQuest.objectives[0].have === progressQuest.objectives[0].need
                         ) {
                             inProgress++;
+                            status = QuestStatus.InProgress;
                         }
                     }
-
-                    if (group.name === 'Brewfest Intro Quests') {
-                        showCurrency = 1037829; // Cyphers of the First Ones
-                    }
                 } else if (group.type === 'campaign' || group.type === 'questline') {
                     const questStatuses = data.ids.map((questId) =>
                         userState.quests.characterById.get(character.id)?.hasQuestById?.has(questId)
@@ -507,13 +527,15 @@ export default function getProgress(
                 }
 
                 if (haveThis) {
-                    haveIndexes.push(dataIndex);
+                    status = QuestStatus.Completed;
                     if (countAccountWide || data.type !== ProgressDataType.AccountQuest) {
                         have++;
                     }
                 } else if (!haveThis && data.required === true) {
                     missingRequired = true;
                 }
+
+                statuses[dataIndex] = status;
             }
         }
     }
@@ -522,13 +544,13 @@ export default function getProgress(
         datas,
         descriptionText,
         have,
-        haveIndexes,
         icon,
         inProgress,
         missingRequired,
         nameOverride,
         showCurrency,
         showReputation,
+        statuses,
         total,
     };
 }
@@ -563,17 +585,3 @@ function getSpentCyphers(character: Character): number {
     }
     return 0;
 }
-
-export interface ProgressInfo {
-    datas: ManualDataProgressData[];
-    descriptionText: Record<number, string>;
-    have: number;
-    haveIndexes: number[];
-    icon: string;
-    inProgress: number;
-    missingRequired: boolean;
-    nameOverride: Record<number, string>;
-    showCurrency: number;
-    showReputation: number;
-    total: number;
-}