From 2f00391a84b3375d13aa6d5a03221d6b99515c9d Mon Sep 17 00:00:00 2001
From: Christian Fehmer <fehmer@users.noreply.github.com>
Date: Tue, 5 May 2026 09:25:58 +0200
Subject: [PATCH 1/5] refactor(account): solid results, tags, account page,
 filter presets (@fehmer, @miodec) (#7854)

Migrates
- account page
- results
- filter presets
- tags

---------

Co-authored-by: Miodec <jack@monkeytype.com>
---
 backend/src/utils/result.ts                   |    9 +
 .../pages/account/utils.spec.ts}              |    6 +-
 .../controllers/preset-controller.spec.ts     |   55 +-
 frontend/package.json                         |   20 +-
 frontend/src/html/pages/account.html          |  428 ----
 frontend/src/html/popups.html                 |    6 -
 frontend/src/index.html                       |    5 +-
 frontend/src/styles/account.scss              |  612 ------
 frontend/src/styles/index.scss                |    2 +-
 frontend/src/styles/media-queries-blue.scss   |   38 -
 frontend/src/styles/media-queries-brown.scss  |    8 -
 frontend/src/styles/media-queries-green.scss  |   43 -
 frontend/src/styles/media-queries-purple.scss |   41 -
 frontend/src/styles/media-queries-yellow.scss |    9 +-
 frontend/src/styles/popups.scss               |   10 -
 frontend/src/styles/test-activity.scss        |  205 ++
 frontend/src/ts/auth.tsx                      |    4 +-
 .../ts/collections/result-filter-presets.ts   |  130 ++
 frontend/src/ts/collections/results.ts        |  610 ++++++
 frontend/src/ts/collections/tags.ts           |  488 +++++
 frontend/src/ts/collections/utils/misc.ts     |    5 +
 frontend/src/ts/commandline/lists/tags.ts     |   40 +-
 .../ts/components/common/Advertisement.tsx    |   36 +
 .../ts/components/common/AnimatedModal.tsx    |    9 +-
 frontend/src/ts/components/common/Kbd.tsx     |    6 +-
 frontend/src/ts/components/mount.tsx          |    2 +
 .../src/ts/components/pages/AboutPage.tsx     |   47 +-
 .../components/pages/account/AccountPage.tsx  |  140 ++
 .../ts/components/pages/account/Charts.tsx    |  140 ++
 .../pages/account/DailyActivityChart.tsx      |  184 ++
 .../ts/components/pages/account/Filters.tsx   |  465 +++++
 .../pages/account/HistogramChart.tsx          |  109 +
 .../components/pages/account/HistoryChart.tsx |  406 ++++
 .../pages/account/MiniResultChart.tsx         |  155 ++
 .../src/ts/components/pages/account/Table.tsx |  302 +++
 .../ts/components/pages/account/TestStats.tsx |  185 ++
 .../components/pages/account/VerifyNotice.tsx |   36 +
 .../src/ts/components/pages/account/utils.ts  |   42 +
 .../src/ts/components/ui/table/DataTable.tsx  |   22 +-
 frontend/src/ts/components/ui/table/Table.tsx |    8 +-
 frontend/src/ts/constants/default-snapshot.ts |   24 +-
 .../src/ts/controllers/chart-controller.ts    |  842 +-------
 .../src/ts/controllers/page-controller.ts     |   33 +-
 .../src/ts/controllers/preset-controller.ts   |   14 +-
 frontend/src/ts/controllers/tag-controller.ts |   84 -
 frontend/src/ts/db.ts                         |  547 +----
 .../src/ts/elements/account/result-filters.ts |  969 ---------
 frontend/src/ts/elements/last-10-average.ts   |   16 +-
 frontend/src/ts/elements/modes-notice.ts      |    7 +-
 frontend/src/ts/elements/result-batches.ts    |    4 +-
 frontend/src/ts/elements/simple-modal.ts      |    7 +-
 frontend/src/ts/event-handlers/account.ts     |   60 -
 frontend/src/ts/event-handlers/settings.ts    |   48 +-
 frontend/src/ts/event-handlers/test.ts        |    4 +-
 frontend/src/ts/firebase.ts                   |   23 +-
 frontend/src/ts/index.ts                      |    3 -
 frontend/src/ts/modals/edit-preset.ts         |    7 +-
 frontend/src/ts/modals/edit-result-tags.ts    |   75 +-
 frontend/src/ts/modals/edit-tag.ts            |  115 +-
 frontend/src/ts/modals/mini-result-chart.ts   |   49 -
 frontend/src/ts/modals/new-filter-preset.ts   |   45 -
 frontend/src/ts/pages/account.ts              | 1246 -----------
 frontend/src/ts/pages/settings.ts             |   22 +-
 frontend/src/ts/states/core.ts                |    1 +
 frontend/src/ts/states/modals.ts              |    3 +-
 frontend/src/ts/states/result-filters.ts      |   44 +
 frontend/src/ts/states/snapshot.ts            |    2 +-
 frontend/src/ts/test/pace-caret.ts            |   26 +-
 frontend/src/ts/test/result.ts                |   35 +-
 frontend/src/ts/test/test-logic.ts            |   10 +-
 frontend/src/ts/test/test-screenshot.ts       |    1 +
 frontend/src/ts/test/today-tracker.ts         |   10 +-
 .../src/ts/utils/local-storage-with-schema.ts |    4 +-
 frontend/src/ts/utils/strings.ts              |   10 +-
 frontend/src/ts/utils/types.ts                |   15 +
 frontend/src/ts/utils/typing-speed-units.ts   |    2 +-
 frontend/static/contributors.json             |    2 +-
 packages/schemas/src/users.ts                 |    5 +-
 pnpm-lock.yaml                                | 1831 +++++++++++++----
 79 files changed, 5413 insertions(+), 5900 deletions(-)
 rename frontend/__tests__/{elements/account/result-filters.spec.ts => components/pages/account/utils.spec.ts} (88%)
 delete mode 100644 frontend/src/html/pages/account.html
 delete mode 100644 frontend/src/styles/account.scss
 create mode 100644 frontend/src/styles/test-activity.scss
 create mode 100644 frontend/src/ts/collections/result-filter-presets.ts
 create mode 100644 frontend/src/ts/collections/results.ts
 create mode 100644 frontend/src/ts/collections/tags.ts
 create mode 100644 frontend/src/ts/collections/utils/misc.ts
 create mode 100644 frontend/src/ts/components/common/Advertisement.tsx
 create mode 100644 frontend/src/ts/components/pages/account/AccountPage.tsx
 create mode 100644 frontend/src/ts/components/pages/account/Charts.tsx
 create mode 100644 frontend/src/ts/components/pages/account/DailyActivityChart.tsx
 create mode 100644 frontend/src/ts/components/pages/account/Filters.tsx
 create mode 100644 frontend/src/ts/components/pages/account/HistogramChart.tsx
 create mode 100644 frontend/src/ts/components/pages/account/HistoryChart.tsx
 create mode 100644 frontend/src/ts/components/pages/account/MiniResultChart.tsx
 create mode 100644 frontend/src/ts/components/pages/account/Table.tsx
 create mode 100644 frontend/src/ts/components/pages/account/TestStats.tsx
 create mode 100644 frontend/src/ts/components/pages/account/VerifyNotice.tsx
 create mode 100644 frontend/src/ts/components/pages/account/utils.ts
 delete mode 100644 frontend/src/ts/controllers/tag-controller.ts
 delete mode 100644 frontend/src/ts/elements/account/result-filters.ts
 delete mode 100644 frontend/src/ts/event-handlers/account.ts
 delete mode 100644 frontend/src/ts/modals/mini-result-chart.ts
 delete mode 100644 frontend/src/ts/modals/new-filter-preset.ts
 delete mode 100644 frontend/src/ts/pages/account.ts
 create mode 100644 frontend/src/ts/states/result-filters.ts
 create mode 100644 frontend/src/ts/utils/types.ts

diff --git a/backend/src/utils/result.ts b/backend/src/utils/result.ts
index 2c79813f8b22..2e99fe2e4e87 100644
--- a/backend/src/utils/result.ts
+++ b/backend/src/utils/result.ts
@@ -122,5 +122,14 @@ export function replaceLegacyValues(result: DBResult): DBResult {
     };
   }
 
+  if (typeof result.mode2 === "number") {
+    result.mode2 = (result.mode2 as number).toString();
+  }
+
+  //legacy value for english_1k
+  if ((result.language as string) === "english_expanded") {
+    result.language = "english_1k";
+  }
+
   return result;
 }
diff --git a/frontend/__tests__/elements/account/result-filters.spec.ts b/frontend/__tests__/components/pages/account/utils.spec.ts
similarity index 88%
rename from frontend/__tests__/elements/account/result-filters.spec.ts
rename to frontend/__tests__/components/pages/account/utils.spec.ts
index 3403dda6b256..9ab523def755 100644
--- a/frontend/__tests__/elements/account/result-filters.spec.ts
+++ b/frontend/__tests__/components/pages/account/utils.spec.ts
@@ -1,8 +1,8 @@
 import { describe, it, expect } from "vitest";
-import defaultResultFilters from "../../../src/ts/constants/default-result-filters";
-import { mergeWithDefaultFilters } from "../../../src/ts/elements/account/result-filters";
+import defaultResultFilters from "../../../../src/ts/constants/default-result-filters";
+import { mergeWithDefaultFilters } from "../../../../src/ts/components/pages/account/utils";
 
-describe("result-filters.ts", () => {
+describe("utils.ts", () => {
   describe("mergeWithDefaultFilters", () => {
     it("should merge with default filters correctly", () => {
       const tests = [
diff --git a/frontend/__tests__/controllers/preset-controller.spec.ts b/frontend/__tests__/controllers/preset-controller.spec.ts
index baef3596b82f..816e9edab7e3 100644
--- a/frontend/__tests__/controllers/preset-controller.spec.ts
+++ b/frontend/__tests__/controllers/preset-controller.spec.ts
@@ -9,7 +9,7 @@ import * as ConfigUtils from "../../src/ts/config/utils";
 import * as Persistence from "../../src/ts/config/persistence";
 import * as Notifications from "../../src/ts/states/notifications";
 import * as TestLogic from "../../src/ts/test/test-logic";
-import * as TagController from "../../src/ts/controllers/tag-controller";
+import * as Tags from "../../src/ts/collections/tags";
 
 describe("PresetController", () => {
   describe("apply", () => {
@@ -34,12 +34,9 @@ describe("PresetController", () => {
       "showSuccessNotification",
     );
     const testRestartMock = vi.spyOn(TestLogic, "restart");
-    const tagControllerClearMock = vi.spyOn(TagController, "clear");
-    const tagControllerSetMock = vi.spyOn(TagController, "set");
-    const tagControllerSaveActiveMock = vi.spyOn(
-      TagController,
-      "saveActiveToLocalStorage",
-    );
+    const tagsClearMock = vi.spyOn(Tags, "clearActiveTags");
+    const tagsSetMock = vi.spyOn(Tags, "setTagActive");
+    const tagsSaveActiveMock = vi.spyOn(Tags, "saveActiveToLocalStorage");
 
     beforeEach(() => {
       [
@@ -49,9 +46,9 @@ describe("PresetController", () => {
         configGetConfigChangesMock,
         notificationAddMock,
         testRestartMock,
-        tagControllerClearMock,
-        tagControllerSetMock,
-        tagControllerSaveActiveMock,
+        tagsClearMock,
+        tagsSetMock,
+        tagsSaveActiveMock,
       ].forEach((it) => it.mockClear());
 
       configApplyMock.mockResolvedValue();
@@ -66,7 +63,7 @@ describe("PresetController", () => {
 
       //THEN
       expect(configApplyMock).toHaveBeenCalledWith(preset.config);
-      expect(tagControllerClearMock).toHaveBeenCalled();
+      expect(tagsClearMock).toHaveBeenCalled();
       expect(testRestartMock).toHaveBeenCalled();
       expect(notificationAddMock).toHaveBeenCalledWith("Preset applied", {
         durationMs: 2000,
@@ -84,20 +81,10 @@ describe("PresetController", () => {
       await PresetController.apply(preset._id);
 
       //THEN
-      expect(tagControllerClearMock).toHaveBeenCalled();
-      expect(tagControllerSetMock).toHaveBeenNthCalledWith(
-        1,
-        "tagOne",
-        true,
-        false,
-      );
-      expect(tagControllerSetMock).toHaveBeenNthCalledWith(
-        2,
-        "tagTwo",
-        true,
-        false,
-      );
-      expect(tagControllerSaveActiveMock).toHaveBeenCalled();
+      expect(tagsClearMock).toHaveBeenCalled();
+      expect(tagsSetMock).toHaveBeenNthCalledWith(1, "tagOne", true, false);
+      expect(tagsSetMock).toHaveBeenNthCalledWith(2, "tagTwo", true, false);
+      expect(tagsSaveActiveMock).toHaveBeenCalled();
     });
 
     it("should ignore unknown preset", async () => {
@@ -145,20 +132,10 @@ describe("PresetController", () => {
       await PresetController.apply(preset._id);
 
       //THEN
-      expect(tagControllerClearMock).toHaveBeenCalled();
-      expect(tagControllerSetMock).toHaveBeenNthCalledWith(
-        1,
-        "tagOne",
-        true,
-        false,
-      );
-      expect(tagControllerSetMock).toHaveBeenNthCalledWith(
-        2,
-        "tagTwo",
-        true,
-        false,
-      );
-      expect(tagControllerSaveActiveMock).toHaveBeenCalled();
+      expect(tagsClearMock).toHaveBeenCalled();
+      expect(tagsSetMock).toHaveBeenNthCalledWith(1, "tagOne", true, false);
+      expect(tagsSetMock).toHaveBeenNthCalledWith(2, "tagTwo", true, false);
+      expect(tagsSaveActiveMock).toHaveBeenCalled();
     });
 
     const givenPreset = (partialPreset: Partial<Preset>): Preset => {
diff --git a/frontend/package.json b/frontend/package.json
index 38af68dbf817..e90f7a3721c0 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -39,14 +39,14 @@
     "@solid-primitives/transition-group": "1.1.2",
     "@solidjs/meta": "0.29.4",
     "@tanstack/pacer-lite": "0.2.1",
-    "@tanstack/query-db-collection": "1.0.27",
-    "@tanstack/solid-db": "0.2.10",
-    "@tanstack/solid-devtools": "0.8.0",
-    "@tanstack/solid-form": "1.28.4",
-    "@tanstack/solid-hotkeys": "0.4.2",
-    "@tanstack/solid-hotkeys-devtools": "0.4.3",
-    "@tanstack/solid-query": "5.90.23",
-    "@tanstack/solid-query-devtools": "5.91.3",
+    "@tanstack/query-db-collection": "1.0.36",
+    "@tanstack/solid-db": "0.2.19",
+    "@tanstack/solid-devtools": "0.8.2",
+    "@tanstack/solid-form": "1.29.1",
+    "@tanstack/solid-hotkeys": "0.9.1",
+    "@tanstack/solid-hotkeys-devtools": "0.6.6",
+    "@tanstack/solid-query": "5.100.3",
+    "@tanstack/solid-query-devtools": "5.100.3",
     "@tanstack/solid-table": "8.21.3",
     "@ts-rest/core": "3.52.1",
     "animejs": "4.2.2",
@@ -55,7 +55,7 @@
     "chart.js": "3.7.1",
     "chartjs-adapter-date-fns": "3.0.0",
     "chartjs-plugin-annotation": "2.2.1",
-    "chartjs-plugin-trendline": "3.2.0",
+    "chartjs-plugin-trendline": "3.2.4",
     "clsx": "2.1.1",
     "color-blend": "4.0.0",
     "damerau-levenshtein": "1.0.8",
@@ -82,7 +82,7 @@
     "@monkeytype/typescript-config": "workspace:*",
     "@solidjs/testing-library": "0.8.10",
     "@tailwindcss/vite": "4.2.1",
-    "@tanstack/eslint-plugin-query": "5.91.4",
+    "@tanstack/eslint-plugin-query": "5.100.3",
     "@testing-library/dom": "10.4.1",
     "@testing-library/jest-dom": "6.9.1",
     "@testing-library/user-event": "14.6.1",
diff --git a/frontend/src/html/pages/account.html b/frontend/src/html/pages/account.html
deleted file mode 100644
index 0797dd993b28..000000000000
--- a/frontend/src/html/pages/account.html
+++ /dev/null
@@ -1,428 +0,0 @@
-<div class="page pageAccount full-width hidden" id="pageAccount">
-  <div class="content full-width content-grid">
-    <mount data-component="myprofile"></mount>
-
-    <div id="ad-account-1-wrapper" class="ad full-width advertisement ad-h">
-      <div class="icon"><i class="fas fa-ad"></i></div>
-      <div id="ad-account-1"></div>
-    </div>
-    <div id="ad-account-1-small-wrapper" class="ad advertisement ad-h-s">
-      <div class="icon small"><i class="fas fa-ad"></i></div>
-      <div id="ad-account-1-small"></div>
-    </div>
-
-    <div class="group resultBatches hidden">
-      <!-- <div class="title">result history</div> -->
-      <div class="bars">
-        <div class="leftText downloaded">Result history:</div>
-        <div class="bar downloaded">
-          <div class="fill"></div>
-        </div>
-        <div class="rightText downloaded">-</div>
-        <div class="leftText limit">Result limit:</div>
-        <div class="bar limit">
-          <div class="fill"></div>
-          <!-- <div class="indicator">
-            <div class="text">completed tests</div>
-            <div class="line"></div>
-          </div> -->
-        </div>
-        <div class="rightText limit">-</div>
-      </div>
-      <div class="text"></div>
-      <button class="loadMoreResults">load more</button>
-    </div>
-
-    <div class="group presetFilterButtons hidden">
-      <div class="buttonsAndTitle">
-        <div class="title">
-          <i class="fas fa-sliders-h"></i>
-          filter presets
-        </div>
-        <div class="buttons filterBtns" style="grid-column: 1/3"></div>
-      </div>
-    </div>
-    <div class="group topFilters">
-      <!-- <div
-        class="button"
-        id="currentConfigFilter"
-        style="grid-column: 1/3;"
-      >
-        set filters to current settings
-      </div> -->
-      <div class="buttonsAndTitle" style="grid-column: 1/3">
-        <div class="title">
-          <i class="fas fa-filter"></i>
-          filters
-        </div>
-        <div class="buttons">
-          <button class="allFilters">all</button>
-          <button class="currentConfigFilter">current settings</button>
-          <button class="toggleAdvancedFilters">advanced</button>
-          <button class="createFilterPresetBtn">save as preset</button>
-        </div>
-      </div>
-      <div
-        class="buttonsAndTitle testDate"
-        style="grid-column: 1/3; margin-top: 1rem"
-      >
-        <!-- <div class="title">date</div> -->
-        <div class="buttons filterGroup" group="date">
-          <button filter="last_day">last day</button>
-          <button filter="last_week">last week</button>
-          <button filter="last_month">last month</button>
-          <button filter="last_3months">last 3 months</button>
-          <button filter="all">all time</button>
-        </div>
-      </div>
-    </div>
-    <div class="group filterButtons hidden">
-      <div class="buttonsAndTitle" style="grid-column: 1/-1">
-        <div class="title">
-          <i class="fas fa-tools"></i>
-          advanced filters
-        </div>
-        <div class="buttons">
-          <button class="noFilters">clear filters</button>
-        </div>
-      </div>
-      <div class="buttonsAndTitle">
-        <div class="title">
-          <i class="fas fa-star"></i>
-          difficulty
-        </div>
-        <div class="buttons filterGroup" group="difficulty">
-          <button filter="normal">normal</button>
-          <button filter="expert">expert</button>
-          <button filter="master">master</button>
-        </div>
-      </div>
-      <div class="buttonsAndTitle">
-        <div class="title">
-          <i class="fas fa-crown"></i>
-          personal best
-        </div>
-        <div class="buttons filterGroup" group="pb">
-          <button filter="no">no</button>
-          <button filter="yes">yes</button>
-        </div>
-      </div>
-      <div class="buttonsAndTitle">
-        <div class="title">
-          <i class="fas fa fa-bars"></i>
-          mode
-        </div>
-        <div class="buttons filterGroup" group="mode">
-          <button filter="words">words</button>
-          <button filter="time">time</button>
-          <button filter="quote">quote</button>
-          <button filter="zen">zen</button>
-          <button filter="custom">custom</button>
-        </div>
-      </div>
-      <div class="buttonsAndTitle">
-        <div class="title">
-          <i class="fas fa-quote-right"></i>
-          quote length
-        </div>
-        <div class="buttons filterGroup" group="quoteLength">
-          <button filter="short">short</button>
-          <button filter="medium">medium</button>
-          <button filter="long">long</button>
-          <button filter="thicc">thicc</button>
-        </div>
-      </div>
-      <div class="buttonsAndTitle">
-        <div class="title">
-          <i class="fas fa-font"></i>
-          words
-        </div>
-        <div class="buttons filterGroup" group="words">
-          <button filter="10">10</button>
-          <button filter="25">25</button>
-          <button filter="50">50</button>
-          <button filter="100">100</button>
-          <button filter="custom">custom</button>
-        </div>
-      </div>
-      <div class="buttonsAndTitle">
-        <div class="title">
-          <i class="fas fa-clock"></i>
-          time
-        </div>
-        <div class="buttons filterGroup" group="time">
-          <button filter="15">15</button>
-          <button filter="30">30</button>
-          <button filter="60">60</button>
-          <button filter="120">120</button>
-          <button filter="custom">custom</button>
-        </div>
-      </div>
-      <div class="buttonsAndTitle">
-        <div class="title">
-          <i class="fas fa-at"></i>
-          punctuation
-        </div>
-        <div class="buttons filterGroup" group="punctuation">
-          <button filter="on">on</button>
-          <button filter="off">off</button>
-        </div>
-      </div>
-      <div class="buttonsAndTitle">
-        <div class="title">
-          <i class="fas fa-hashtag"></i>
-          numbers
-        </div>
-        <div class="buttons filterGroup" group="numbers">
-          <button filter="on">on</button>
-          <button filter="off">off</button>
-        </div>
-      </div>
-      <div class="tripleSelectsColumn">
-        <div class="buttonsAndTitle tags">
-          <div class="title">
-            <i class="fas fa-tag"></i>
-            tags
-          </div>
-          <div class="select filterGroup" group="tags">
-            <select
-              class="tagsSelect"
-              group="tags"
-              placeholder="select a tag"
-              multiple
-            ></select>
-          </div>
-        </div>
-        <div class="buttonsAndTitle funbox">
-          <div class="title">
-            <i class="fas fa-gamepad"></i>
-            funbox
-          </div>
-          <div class="select filterGroup" group="funbox">
-            <select
-              class="funboxSelect"
-              group="funbox"
-              placeholder="select a funbox"
-              multiple
-            ></select>
-          </div>
-        </div>
-        <div class="buttonsAndTitle languages">
-          <div class="title">
-            <i class="fas fa-globe-americas"></i>
-            language
-          </div>
-          <div class="select filterGroup" group="language">
-            <select
-              class="languageSelect"
-              group="language"
-              placeholder="select a language"
-              multiple
-            ></select>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="group noDataError hidden">
-      No data found. Check your filters.
-    </div>
-    <div class="group chart">
-      <!-- <div class="chartPreloader">
-      <i class="fas fa-fw fa-spin fa-circle-notch"></i>
-    </div> -->
-      <div class="above"></div>
-      <div class="chart">
-        <canvas id="accountHistoryChart"></canvas>
-      </div>
-
-      <div class="below">
-        <div class="text"></div>
-        <div class="buttons">
-          <button class="toggleResultsOnChart">
-            <i class="fas fa-tachometer-alt"></i>
-            Speed
-          </button>
-          <button class="toggleAccuracyOnChart">
-            <i class="fas fa-bullseye"></i>
-            Accuracy
-          </button>
-          <button class="toggleAverage10OnChart">
-            <i class="fas fa-chart-line"></i>
-            Avg of 10
-          </button>
-          <button class="toggleAverage100OnChart">
-            <i class="fas fa-chart-line"></i>
-            Avg of 100
-          </button>
-        </div>
-      </div>
-    </div>
-    <div class="group histogramChart">
-      <div class="chart" style="height: 200px">
-        <canvas id="accountHistogramChart"></canvas>
-      </div>
-    </div>
-    <div class="group dailyActivityChart">
-      <div class="chart" style="height: 200px">
-        <canvas id="accountActivityChart"></canvas>
-      </div>
-    </div>
-    <div class="group estimatedWordsTyped">
-      <div class="title">estimated words typed</div>
-      <div class="val">-</div>
-    </div>
-    <div class="triplegroup stats">
-      <div class="group testsStarted">
-        <div class="title">tests started</div>
-        <div class="val">-</div>
-      </div>
-      <div class="group testsCompleted">
-        <div class="title">
-          tests completed
-          <span
-            data-balloon-length="xlarge"
-            data-balloon-pos="up"
-            aria-label="Due to the increasing number of results in the database, you can now only see your last 1000 results in detail. Total time spent typing, started and completed tests stats will still be up to date at the top of the page, above the filters."
-            role="alertdialog"
-          >
-            <i class="fas fa-question-circle"></i>
-          </span>
-        </div>
-        <div class="val">-</div>
-        <div class="avgres">-</div>
-      </div>
-      <div class="group timeTotalFiltered">
-        <div class="title">time typing</div>
-        <div class="val">-</div>
-      </div>
-      <div class="group highestWpm">
-        <div class="title">highest wpm</div>
-        <div class="val">-</div>
-        <div class="mode"></div>
-      </div>
-      <div class="group averageWpm">
-        <div class="title">average wpm</div>
-        <div class="val">-</div>
-      </div>
-      <div class="group averageWpm10">
-        <div class="title">
-          average wpm
-          <br />
-          (last 10 tests)
-        </div>
-        <div class="val">-</div>
-      </div>
-
-      <div class="group highestRaw">
-        <div class="title">highest raw wpm</div>
-        <div class="val">-</div>
-        <div class="mode"></div>
-      </div>
-      <div class="group averageRaw">
-        <div class="title">average raw wpm</div>
-        <div class="val">-</div>
-      </div>
-      <div class="group averageRaw10">
-        <div class="title">
-          average raw wpm
-          <br />
-          (last 10 tests)
-        </div>
-        <div class="val">-</div>
-      </div>
-      <div class="group highestAcc">
-        <div class="title">highest accuracy</div>
-        <div class="val">-</div>
-      </div>
-      <div class="group avgAcc">
-        <div class="title">avg accuracy</div>
-        <div class="val">-</div>
-      </div>
-      <div class="group avgAcc10">
-        <div class="title">
-          avg accuracy
-          <br />
-          (last 10 tests)
-        </div>
-        <div class="val">-</div>
-      </div>
-      <div class="group highestCons">
-        <div class="title">highest consistency</div>
-        <div class="val">-</div>
-      </div>
-      <div class="group avgCons">
-        <div class="title">avg consistency</div>
-        <div class="val">-</div>
-      </div>
-      <div class="group avgCons10">
-        <div class="title">
-          avg consistency
-          <br />
-          (last 10 tests)
-        </div>
-        <div class="val">-</div>
-      </div>
-      <!-- <div class="group favouriteTest">
-      <div class="title">favourite test</div>
-      <div class="val">words 10</div>
-    </div> -->
-    </div>
-    <div class="group aboveHistory">
-      <div class="button exportCSV">
-        <i class="fas fa-file-csv"></i>
-        Export CSV
-      </div>
-    </div>
-    <div id="ad-account-2-wrapper" class="ad full-width advertisement ad-h">
-      <div class="icon"><i class="fas fa-ad"></i></div>
-      <div id="ad-account-2"></div>
-    </div>
-    <div id="ad-account-2-small-wrapper" class="ad advertisement ad-h-s">
-      <div class="icon small"><i class="fas fa-ad"></i></div>
-      <div id="ad-account-2-small"></div>
-    </div>
-    <div class="group history">
-      <!-- <div class="title">result history</div> -->
-      <table width="100%">
-        <thead>
-          <tr>
-            <td></td>
-            <td data-sort-property="wpm" data-sort-default-direction="desc">
-              wpm
-            </td>
-            <td data-sort-property="rawWpm" data-sort-default-direction="desc">
-              raw
-            </td>
-            <td data-sort-property="acc" data-sort-default-direction="desc">
-              accuracy
-            </td>
-            <td
-              data-sort-property="consistency"
-              data-sort-default-direction="desc"
-            >
-              consistency
-            </td>
-            <td
-              aria-label="correct/incorrect/extra/missed"
-              data-balloon-pos="up"
-            >
-              chars
-            </td>
-            <td>mode</td>
-            <!-- <td>punctuation</td> -->
-            <td>info</td>
-            <td>tags</td>
-            <td
-              data-sort-property="timestamp"
-              data-sort-default-direction="desc"
-            >
-              date
-            </td>
-          </tr>
-        </thead>
-        <tbody></tbody>
-      </table>
-      <div class="loadMoreButton">load more</div>
-    </div>
-  </div>
-</div>
diff --git a/frontend/src/html/popups.html b/frontend/src/html/popups.html
index 4dd3c50507ed..0461edfa0343 100644
--- a/frontend/src/html/popups.html
+++ b/frontend/src/html/popups.html
@@ -7,12 +7,6 @@
   </div>
 </dialog>
 
-<dialog id="miniResultChartModal" class="modalWrapper hidden">
-  <div class="modal">
-    <canvas></canvas>
-  </div>
-</dialog>
-
 <dialog id="lastSignedOutResult" class="modalWrapper hidden">
   <div class="modal">
     <div class="title">Last signed out result</div>
diff --git a/frontend/src/index.html b/frontend/src/index.html
index 26f1c442e032..016aa7b2e605 100644
--- a/frontend/src/index.html
+++ b/frontend/src/index.html
@@ -37,11 +37,12 @@
           <mount data-component="aboutpage"></mount>
         </div>
         <load src="html/pages/settings.html" />
+        <div class="page pageAccount hidden" id="pageAccount">
+          <mount data-component="accountpage"></mount>
+        </div>
         <div class="page pageLogin hidden" id="pageLogin">
           <mount data-component="loginpage"></mount>
         </div>
-        <load src="html/pages/account.html" />
-
         <div class="page pageProfile hidden" id="pageProfile">
           <mount data-component="profilepage"></mount>
         </div>
diff --git a/frontend/src/styles/account.scss b/frontend/src/styles/account.scss
deleted file mode 100644
index 54f8a28f2fdc..000000000000
--- a/frontend/src/styles/account.scss
+++ /dev/null
@@ -1,612 +0,0 @@
-.pageAccount {
-  height: 100%;
-
-  .accountVerificatinNotice {
-    background: var(--bg-color);
-    border-radius: var(--roundness);
-    box-shadow: 0 0 0 0.2rem var(--sub-alt-color);
-    // background: color-mix(in srgb, var(--sub-alt-color) 50%, transparent);
-    // background: var(--sub-alt-color);
-    display: grid;
-    grid-template-columns: auto 1fr auto;
-    align-items: center;
-    gap: 1rem;
-    padding: 1rem;
-    .icon {
-      font-size: 2rem;
-      margin-left: 1rem;
-      margin-right: 1rem;
-      color: var(--sub-color);
-    }
-    button {
-      padding: 1rem;
-    }
-  }
-
-  .content {
-    gap: 2rem;
-  }
-
-  .sendVerificationEmail {
-    cursor: pointer;
-  }
-
-  .triplegroup {
-    display: grid;
-    grid-template-columns: 1fr 1fr 1fr;
-    gap: 1rem;
-
-    .text {
-      align-self: center;
-      color: var(--sub-color);
-    }
-  }
-
-  .group {
-    &.estimatedWordsTyped {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      .title {
-        margin-right: 1rem;
-      }
-    }
-
-    &.resultBatches {
-      display: grid;
-      grid-template-areas: "bar button" "text text";
-      grid-template-columns: 2fr 1fr;
-      column-gap: 1rem;
-      .title {
-        grid-area: title;
-        margin-bottom: 0;
-      }
-      & > .text {
-        grid-area: text;
-        text-align: center;
-      }
-      button {
-        grid-area: button;
-      }
-      .leftText,
-      button,
-      .rightText {
-        align-self: center;
-      }
-      .bars {
-        display: grid;
-        grid-template-columns: auto 1fr auto;
-        gap: 0.25rem 1rem;
-      }
-      .rightText {
-        color: var(--sub-color);
-        font-size: 0.8em;
-        line-height: 1.25em;
-      }
-      .bar {
-        height: 0.5rem;
-        border-radius: var(--roundness);
-        background: var(--sub-alt-color);
-        position: relative;
-        align-self: center;
-        .fill {
-          transition: width 0.125s;
-          height: 100%;
-          width: 0%;
-          background: var(--main-color);
-          border-radius: var(--roundness);
-        }
-
-        //not used for now
-        .indicator {
-          position: absolute;
-          width: max-content;
-          bottom: 0;
-          .line {
-            width: 0.1em;
-            height: 1.5em;
-            background: var(--sub-color);
-            border-radius: var(--roundness);
-            right: 0;
-            position: absolute;
-            top: 0;
-          }
-          .text {
-            font-size: 0.5em;
-            color: var(--sub-color);
-            margin-right: 1em;
-          }
-        }
-      }
-    }
-
-    &.noDataError {
-      margin: 20rem 0;
-      text-align: center;
-    }
-
-    &.aboveHistory {
-      display: grid;
-      grid-template-columns: 1fr 1fr 1fr;
-      .exportCSV {
-        grid-column: 3/4;
-      }
-    }
-
-    &.createdDate {
-      text-align: center;
-      color: var(--sub-color);
-    }
-
-    &.personalBestTables {
-      .tables {
-        display: grid;
-        grid-template-columns: 1fr 1fr;
-        gap: 2rem;
-      }
-    }
-
-    .chart canvas {
-      width: 100% !important;
-    }
-
-    &.history {
-      table td {
-        appearance: unset;
-      }
-
-      table tr {
-        border-radius: var(--roundness);
-      }
-
-      .active {
-        animation: accountRowHighlight 5s linear 0s 1;
-      }
-
-      .loadMoreButton {
-        background: var(--sub-alt-color);
-        color: var(--text-color);
-        text-align: center;
-        padding: 0.5rem;
-        border-radius: var(--roundness);
-        cursor: pointer;
-        transition: 0.25s;
-        user-select: none;
-        display: grid;
-        -ms-flex-line-pack: center;
-        align-content: center;
-        margin-top: 1rem;
-
-        &:hover,
-        &:focus {
-          color: var(--bg-color);
-          background: var(--text-color);
-        }
-      }
-    }
-
-    .title {
-      color: var(--sub-color);
-      // margin-bottom: 0.25em;
-    }
-
-    .avgres {
-      font-size: 0.75em;
-    }
-
-    .val {
-      font-size: 3rem;
-      line-height: 1.1;
-    }
-
-    .chartjs-render-monitor {
-      width: 100% !important;
-    }
-
-    &.chart {
-      position: relative;
-
-      .above {
-        display: flex;
-        justify-content: center;
-        margin-bottom: 1rem;
-        color: var(--sub-color);
-        flex-wrap: wrap;
-        row-gap: 0.5em;
-
-        .group {
-          display: flex;
-          align-items: center;
-        }
-
-        .fas,
-        .punc {
-          margin-right: 0.25rem;
-        }
-
-        .spacer {
-          width: 1rem;
-        }
-      }
-
-      .below {
-        text-align: center;
-        color: var(--sub-color);
-        margin-top: 1rem;
-        display: grid;
-        grid-template-columns: auto 500px;
-        gap: 1rem;
-        align-items: center;
-        .text {
-          height: min-content;
-        }
-        .buttons {
-          font-size: 0.75rem;
-          display: grid;
-          gap: 0.5rem;
-          grid-template-columns: 1fr 1fr 1fr 1fr;
-        }
-      }
-      .chart {
-        height: 400px;
-      }
-      .chartPreloader {
-        position: absolute;
-        width: 100%;
-        background: rgba(0, 0, 0, 0.5);
-        height: 100%;
-        display: grid;
-        align-items: center;
-        justify-content: center;
-        font-size: 5rem;
-        text-shadow: 0 0 3rem black;
-      }
-    }
-  }
-
-  table {
-    border-spacing: 0;
-    border-collapse: collapse;
-    color: var(--text-color);
-
-    td {
-      padding: 0.5rem 0.5rem;
-    }
-
-    thead {
-      color: var(--sub-color);
-      font-size: 0.75rem;
-    }
-
-    tbody tr:nth-child(odd) {
-      background: var(--sub-alt-color);
-    }
-
-    tbody td:nth-child(1) {
-      border-radius: var(--roundness) 0 0 var(--roundness);
-    }
-    tbody td:last-child {
-      border-radius: 0 var(--roundness) var(--roundness) 0;
-    }
-
-    td.infoIcons span {
-      margin: 0 0.1rem;
-    }
-    .miniResultChartButton {
-      transition: 0.25s;
-      cursor: pointer;
-      color: var(--text-color);
-      &:hover {
-        opacity: 1;
-      }
-      &.loading {
-        pointer-events: none;
-      }
-      &.disabled .fas {
-        opacity: 0.5;
-        color: var(--sub-color);
-      }
-    }
-  }
-
-  td:has(.resultEditTagsButton) {
-    padding: 0;
-  }
-
-  .resultEditTagsButton {
-    opacity: 0.5;
-    &.active {
-      color: var(--text-color);
-    }
-    &:hover,
-    &:focus-visible,
-    &.active {
-      opacity: 1;
-    }
-  }
-  //remove flashHighlight from .group.History .active
-  .group.history .resultEditTagsButton {
-    animation: none;
-  }
-
-  .group {
-    .buttonsAndTitle {
-      height: fit-content;
-      display: grid;
-      gap: 0.5rem;
-      color: var(--sub-color);
-
-      .title {
-        display: flex;
-        align-items: baseline;
-        .fab,
-        .fas,
-        .far {
-          margin-right: 0.5em;
-        }
-      }
-    }
-
-    &.presetFilterButtons {
-      .buttons {
-        display: grid;
-        grid-template-columns: repeat(auto-fit, minmax(20rem, 1fr));
-        gap: 1rem;
-        .filterPresets {
-          display: grid;
-          grid-template-columns: 1fr auto;
-          gap: 0.5rem;
-        }
-      }
-    }
-
-    &.topFilters {
-      .buttons {
-        display: flex;
-        justify-content: space-evenly;
-        gap: 1rem;
-        button {
-          width: 100%;
-        }
-      }
-    }
-
-    //advanced filters
-    &.filterButtons {
-      gap: 1rem;
-      display: grid;
-      grid-template-columns: 1fr 1fr;
-
-      .buttons {
-        display: grid;
-        grid-auto-flow: column;
-        gap: 0.5rem;
-      }
-
-      .tripleSelectsColumn {
-        grid-column: 1/-1;
-        display: flex;
-        gap: 1rem;
-        flex-wrap: wrap;
-        .buttonsAndTitle {
-          flex-grow: 1;
-          min-width: 20rem;
-        }
-      }
-
-      &.testDate .buttons,
-      &.languages .buttons,
-      &.layouts .buttons,
-      &.funbox .buttons,
-      &.tags .buttons {
-        grid-template-columns: repeat(4, 1fr);
-        grid-auto-flow: unset;
-      }
-    }
-  }
-}
-.testActivity {
-  // width: max-content;
-  // justify-self: center;
-  background: var(--sub-alt-color);
-  border-radius: var(--roundness);
-  padding: 1rem;
-  display: flex;
-  justify-content: center;
-
-  --gap-size: 0.25em;
-  --font-size: 1em;
-
-  .wrapper {
-    width: 100%;
-    max-width: 80em;
-    display: grid;
-    grid-template-columns: min-content 1fr;
-    grid-template-rows: min-content 1fr min-content;
-    gap: 1em 1em;
-    grid-template-areas:
-      "top top"
-      "day chart"
-      "empty month";
-    // grid-template-areas:
-    //   "empty month"
-    //   "day chart"
-    //   "top top";
-    // font-size: 0.75rem;
-  }
-
-  .note {
-    grid-column: span 2;
-    text-align: center;
-    font-size: 0.6em;
-    color: var(--sub-color);
-  }
-
-  .top {
-    grid-area: top;
-    display: grid;
-    grid-template-columns: 15rem 1fr max-content;
-    grid-template-areas: "title title legend";
-    gap: 1rem;
-    &:has(.year) {
-      grid-template-areas: "year title legend";
-    }
-  }
-
-  .ss-main {
-    border: 0.2em solid var(--bg-color);
-  }
-
-  .yearSelect,
-  .months div,
-  .days div,
-  .daysFull div,
-  .legend {
-    color: var(--sub-color);
-  }
-
-  .year {
-    grid-area: year;
-    font-size: var(--font-size);
-  }
-
-  .title {
-    grid-area: title;
-    text-align: left;
-    font-size: var(--font-size);
-    color: var(--sub-color);
-    align-self: center;
-  }
-
-  .months {
-    grid-area: month;
-    display: grid;
-    grid-template-columns: repeat(53, 1fr);
-
-    div {
-      width: 100%;
-      text-align: center;
-    }
-    font-size: var(--font-size);
-  }
-
-  .daysFull {
-    margin-right: 2rem;
-  }
-
-  .days,
-  .daysFull {
-    grid-area: day;
-    display: grid;
-    grid-template-rows: repeat(7, 1fr);
-    align-items: center;
-    // div {
-    // display: grid;
-    // overflow: hidden;
-    // align-items: center;
-    // }
-    .text {
-      display: flex;
-      height: 0;
-      align-items: center;
-      font-size: var(--font-size);
-    }
-  }
-
-  .days {
-    display: none;
-  }
-
-  .nodata {
-    grid-area: chart;
-  }
-
-  .activity {
-    grid-area: chart;
-    display: grid;
-    grid-auto-flow: column;
-    grid-template-rows: repeat(7, 1fr);
-    grid-template-columns: repeat(53, 1fr);
-    gap: var(--gap-size);
-    // width: max-content;
-    // max-width: 100%;
-
-    div {
-      &:hover {
-        border: 2px solid var(--text-color);
-      }
-      &[data-level="filler"]:hover {
-        border: none;
-      }
-    }
-  }
-  .legend {
-    grid-area: legend;
-    display: flex;
-    gap: var(--gap-size);
-    justify-content: flex-end;
-    align-self: center;
-    align-items: center;
-
-    span {
-      font-size: var(--font-size);
-      &:first-child {
-        margin-right: var(--gap-size);
-      }
-      &:last-child {
-        margin-left: var(--gap-size);
-      }
-    }
-  }
-  .activity div,
-  .legend div {
-    width: 100%;
-    aspect-ratio: 1;
-    border-radius: var(--gap-size);
-    place-self: center;
-
-    &[data-level="filler"] {
-      background: none;
-    }
-    &[data-level="0"] {
-      background-color: color-mix(
-        in srgb,
-        var(--bg-color) 50%,
-        var(--sub-alt-color)
-      );
-      background-color: var(--bg-color);
-    }
-    &[data-level="1"] {
-      background-color: color-mix(
-        in srgb,
-        var(--main-color) 20%,
-        var(--sub-alt-color)
-      );
-    }
-
-    &[data-level="2"] {
-      background-color: color-mix(
-        in srgb,
-        var(--main-color) 50%,
-        var(--sub-alt-color)
-      );
-    }
-
-    &[data-level="3"] {
-      background-color: color-mix(
-        in srgb,
-        var(--main-color) 75%,
-        var(--sub-alt-color)
-      );
-    }
-
-    &[data-level="4"] {
-      background-color: var(--main-color);
-    }
-  }
-
-  .legend div {
-    width: 1em;
-    height: 1em;
-  }
-}
diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss
index 7e047a112b5c..634b0a35de20 100644
--- a/frontend/src/styles/index.scss
+++ b/frontend/src/styles/index.scss
@@ -16,7 +16,7 @@
 }
 
 @layer custom-styles {
-  @import "buttons", "404", "ads", "account", "animations", "caret",
+  @import "buttons", "404", "ads", "test-activity", "animations", "caret",
     "commandline", "core", "fonts", "inputs", "keymap", "monkey", "popups",
     "scroll", "settings", "account-settings", "test", "loading", "friends",
     "media-queries";
diff --git a/frontend/src/styles/media-queries-blue.scss b/frontend/src/styles/media-queries-blue.scss
index a19cc3c4c8f3..98ea5c61a32d 100644
--- a/frontend/src/styles/media-queries-blue.scss
+++ b/frontend/src/styles/media-queries-blue.scss
@@ -38,44 +38,6 @@
       }
     }
   }
-  .pageAccount {
-    .triplegroup.stats {
-      .title {
-        font-size: 0.75rem;
-      }
-      .val {
-        font-size: 1.5rem;
-      }
-    }
-    .group.estimatedWordsTyped {
-      .val {
-        font-size: 2rem;
-      }
-    }
-    .group.history table thead td:nth-child(7),
-    .group.history table tbody td:nth-child(7) {
-      display: none;
-    }
-    .group.filterButtons {
-      grid-template-columns: 1fr;
-    }
-  }
-  .pageAccountSettings {
-    .main {
-      grid-template-columns: 1fr;
-      grid-template-rows: auto auto;
-      .tabs {
-        padding: 0;
-        display: grid;
-        grid-auto-flow: row;
-        button {
-          justify-content: center;
-          padding: 1em 0.5em;
-        }
-      }
-    }
-  }
-
   .pageSettings {
     .accountSettingsNotice {
       button {
diff --git a/frontend/src/styles/media-queries-brown.scss b/frontend/src/styles/media-queries-brown.scss
index 9b8ede989328..1e6e97077dba 100644
--- a/frontend/src/styles/media-queries-brown.scss
+++ b/frontend/src/styles/media-queries-brown.scss
@@ -24,14 +24,6 @@
       }
     }
   }
-  .pageAccount {
-    .group.history table thead td:nth-child(3),
-    .group.history table tbody td:nth-child(3),
-    .group.history table thead td:nth-child(5),
-    .group.history table tbody td:nth-child(5) {
-      display: none;
-    }
-  }
   #keymap .row {
     height: 1rem;
     gap: 0.1rem;
diff --git a/frontend/src/styles/media-queries-green.scss b/frontend/src/styles/media-queries-green.scss
index 53bfd5534b82..f7b4c766e7ff 100644
--- a/frontend/src/styles/media-queries-green.scss
+++ b/frontend/src/styles/media-queries-green.scss
@@ -54,49 +54,6 @@
       }
     }
   }
-  .pageAccount {
-    .group.resultBatches {
-      gap: 1rem;
-      grid-template-areas: "bar" "button" "text";
-      grid-template-columns: 1fr;
-    }
-    .group.topFilters {
-      .buttons {
-        display: grid;
-        grid-template-columns: 1fr 1fr;
-        button[filter="all"] {
-          grid-column: span 2;
-        }
-        &.filterGroup {
-          margin-top: 2rem;
-        }
-      }
-    }
-    .group.chart .below {
-      grid-template-columns: 1fr;
-      .buttons {
-        grid-template-columns: 1fr 1fr 1fr 1fr;
-      }
-    }
-    .triplegroup.stats {
-      .val {
-        font-size: 2rem;
-      }
-    }
-    .group.history {
-      font-size: 0.75rem;
-    }
-    .group.history table thead td:nth-child(6),
-    .group.history table tbody td:nth-child(6) {
-      display: none;
-    }
-    // .group.history table thead td:nth-child(8),
-    // .group.history table thead td:nth-child(9),
-    // .group.history table tbody td:nth-child(8),
-    // .group.history table tbody td:nth-child(9) {
-    //   display: none;
-    // }
-  }
 
   .testActivity {
     --gap-size: 0.1em;
diff --git a/frontend/src/styles/media-queries-purple.scss b/frontend/src/styles/media-queries-purple.scss
index b52428e12f6d..ef35fc4107be 100644
--- a/frontend/src/styles/media-queries-purple.scss
+++ b/frontend/src/styles/media-queries-purple.scss
@@ -56,47 +56,6 @@
       }
     }
   }
-  .pageAccount {
-    .accountVerificatinNotice {
-      button {
-        grid-column: -1 / 1;
-      }
-    }
-    .group.resultBatches {
-      gap: 1rem;
-      grid-template-areas: "bar" "button" "text";
-      grid-template-columns: 1fr;
-    }
-    .group.topFilters {
-      .buttons {
-        grid-template-columns: 1fr;
-        button[filter="all"] {
-          grid-column: span 1;
-        }
-      }
-    }
-    .group.chart .below {
-      .buttons {
-        grid-template-columns: repeat(auto-fit, minmax(7rem, 1fr));
-      }
-    }
-    .triplegroup.stats {
-      grid-template-columns: repeat(auto-fit, minmax(10rem, 1fr));
-    }
-    .group.aboveHistory {
-      grid-template-columns: 1fr;
-      .exportCSV {
-        grid-column: span 1;
-      }
-    }
-    .group.history table thead td:nth-child(8),
-    .group.history table tbody td:nth-child(8),
-    .group.history table thead td:nth-child(9),
-    .group.history table tbody td:nth-child(9) {
-      display: none;
-    }
-  }
-
   #keymap .row {
     height: 1.25rem;
   }
diff --git a/frontend/src/styles/media-queries-yellow.scss b/frontend/src/styles/media-queries-yellow.scss
index 1d8d9782123b..1ee3d4867899 100644
--- a/frontend/src/styles/media-queries-yellow.scss
+++ b/frontend/src/styles/media-queries-yellow.scss
@@ -20,14 +20,7 @@
       grid-template-columns: 1fr 1fr;
     }
   }
-  .pageAccount {
-    .group.chart .below {
-      grid-template-columns: auto 250px;
-      .buttons {
-        grid-template-columns: 1fr 1fr;
-      }
-    }
-  }
+
   .pageTest {
     #liveStatsTextTop,
     #liveStatsTextBottom {
diff --git a/frontend/src/styles/popups.scss b/frontend/src/styles/popups.scss
index 304c7a6d87e0..0ac1c5252d81 100644
--- a/frontend/src/styles/popups.scss
+++ b/frontend/src/styles/popups.scss
@@ -75,16 +75,6 @@ body.darkMode {
   }
 }
 
-#miniResultChartModal {
-  .modal {
-    overflow: hidden;
-    max-width: 70rem;
-    canvas {
-      max-height: 200px;
-    }
-  }
-}
-
 #forgotPasswordModal {
   .modal {
     max-width: 400px;
diff --git a/frontend/src/styles/test-activity.scss b/frontend/src/styles/test-activity.scss
new file mode 100644
index 000000000000..84d852c3b9c6
--- /dev/null
+++ b/frontend/src/styles/test-activity.scss
@@ -0,0 +1,205 @@
+.testActivity {
+  // width: max-content;
+  // justify-self: center;
+  background: var(--sub-alt-color);
+  border-radius: var(--roundness);
+  padding: 1rem;
+  display: flex;
+  justify-content: center;
+
+  --gap-size: 0.25em;
+  --font-size: 1em;
+
+  .wrapper {
+    width: 100%;
+    max-width: 80em;
+    display: grid;
+    grid-template-columns: min-content 1fr;
+    grid-template-rows: min-content 1fr min-content;
+    gap: 1em 1em;
+    grid-template-areas:
+      "top top"
+      "day chart"
+      "empty month";
+    // grid-template-areas:
+    //   "empty month"
+    //   "day chart"
+    //   "top top";
+    // font-size: 0.75rem;
+  }
+
+  .note {
+    grid-column: span 2;
+    text-align: center;
+    font-size: 0.6em;
+    color: var(--sub-color);
+  }
+
+  .top {
+    grid-area: top;
+    display: grid;
+    grid-template-columns: 15rem 1fr max-content;
+    grid-template-areas: "title title legend";
+    gap: 1rem;
+    &:has(.year) {
+      grid-template-areas: "year title legend";
+    }
+  }
+
+  .ss-main {
+    border: 0.2em solid var(--bg-color);
+  }
+
+  .yearSelect,
+  .months div,
+  .days div,
+  .daysFull div,
+  .legend {
+    color: var(--sub-color);
+  }
+
+  .year {
+    grid-area: year;
+    font-size: var(--font-size);
+  }
+
+  .title {
+    grid-area: title;
+    text-align: left;
+    font-size: var(--font-size);
+    color: var(--sub-color);
+    align-self: center;
+  }
+
+  .months {
+    grid-area: month;
+    display: grid;
+    grid-template-columns: repeat(53, 1fr);
+
+    div {
+      width: 100%;
+      text-align: center;
+    }
+    font-size: var(--font-size);
+  }
+
+  .daysFull {
+    margin-right: 2rem;
+  }
+
+  .days,
+  .daysFull {
+    grid-area: day;
+    display: grid;
+    grid-template-rows: repeat(7, 1fr);
+    align-items: center;
+    // div {
+    // display: grid;
+    // overflow: hidden;
+    // align-items: center;
+    // }
+    .text {
+      display: flex;
+      height: 0;
+      align-items: center;
+      font-size: var(--font-size);
+    }
+  }
+
+  .days {
+    display: none;
+  }
+
+  .nodata {
+    grid-area: chart;
+  }
+
+  .activity {
+    grid-area: chart;
+    display: grid;
+    grid-auto-flow: column;
+    grid-template-rows: repeat(7, 1fr);
+    grid-template-columns: repeat(53, 1fr);
+    gap: var(--gap-size);
+    // width: max-content;
+    // max-width: 100%;
+
+    div {
+      &:hover {
+        border: 2px solid var(--text-color);
+      }
+      &[data-level="filler"]:hover {
+        border: none;
+      }
+    }
+  }
+  .legend {
+    grid-area: legend;
+    display: flex;
+    gap: var(--gap-size);
+    justify-content: flex-end;
+    align-self: center;
+    align-items: center;
+
+    span {
+      font-size: var(--font-size);
+      &:first-child {
+        margin-right: var(--gap-size);
+      }
+      &:last-child {
+        margin-left: var(--gap-size);
+      }
+    }
+  }
+  .activity div,
+  .legend div {
+    width: 100%;
+    aspect-ratio: 1;
+    border-radius: var(--gap-size);
+    place-self: center;
+
+    &[data-level="filler"] {
+      background: none;
+    }
+    &[data-level="0"] {
+      background-color: color-mix(
+        in srgb,
+        var(--bg-color) 50%,
+        var(--sub-alt-color)
+      );
+      background-color: var(--bg-color);
+    }
+    &[data-level="1"] {
+      background-color: color-mix(
+        in srgb,
+        var(--main-color) 20%,
+        var(--sub-alt-color)
+      );
+    }
+
+    &[data-level="2"] {
+      background-color: color-mix(
+        in srgb,
+        var(--main-color) 50%,
+        var(--sub-alt-color)
+      );
+    }
+
+    &[data-level="3"] {
+      background-color: color-mix(
+        in srgb,
+        var(--main-color) 75%,
+        var(--sub-alt-color)
+      );
+    }
+
+    &[data-level="4"] {
+      background-color: var(--main-color);
+    }
+  }
+
+  .legend div {
+    width: 1em;
+    height: 1em;
+  }
+}
diff --git a/frontend/src/ts/auth.tsx b/frontend/src/ts/auth.tsx
index 01939173ae07..9986737851ba 100644
--- a/frontend/src/ts/auth.tsx
+++ b/frontend/src/ts/auth.tsx
@@ -22,7 +22,7 @@ import {
   resetIgnoreAuthCallback,
 } from "./firebase";
 import * as Sentry from "./sentry";
-import { isAuthenticated } from "./states/core";
+import { isAuthenticated, setUserId } from "./states/core";
 import { showLoaderBar, hideLoaderBar } from "./states/loader-bar";
 import {
   showNoticeNotification,
@@ -120,8 +120,10 @@ export async function onAuthStateChanged(
   if (authInitialisedAndConnected) {
     console.debug(`auth state changed, user ${user ? "true" : "false"}`);
     if (user) {
+      setUserId(user.uid);
       userPromise = loadUser(user);
     } else {
+      setUserId(null);
       DB.setSnapshot(undefined);
     }
   }
diff --git a/frontend/src/ts/collections/result-filter-presets.ts b/frontend/src/ts/collections/result-filter-presets.ts
new file mode 100644
index 000000000000..d283c86d0a6c
--- /dev/null
+++ b/frontend/src/ts/collections/result-filter-presets.ts
@@ -0,0 +1,130 @@
+import { ResultFilters } from "@monkeytype/schemas/users";
+import { queryCollectionOptions } from "@tanstack/query-db-collection";
+import {
+  createCollection,
+  createOptimisticAction,
+  useLiveQuery,
+} from "@tanstack/solid-db";
+import Ape from "../ape";
+import { queryClient } from "../queries";
+import { baseKey } from "../queries/utils/keys";
+import {
+  replaceSpacesWithUnderscores,
+  replaceUnderscoresWithSpaces,
+} from "../utils/strings";
+import { tempId } from "./utils/misc";
+
+const queryKeys = {
+  root: () => [...baseKey("resultFilterPresets", { isUserSpecific: true })],
+};
+
+const resultFilterPresetsCollection = createCollection(
+  queryCollectionOptions({
+    staleTime: Infinity,
+    startSync: true,
+    queryKey: queryKeys.root(),
+
+    queryClient,
+    getKey: (it) => it._id,
+    queryFn: async () => {
+      //return emtpy array. We load the user with the snapshot and fill the collection from there
+      return [] as ResultFilters[];
+    },
+  }),
+);
+
+// oxlint-disable-next-line typescript/explicit-function-return-type
+export function useResultFilterPresetsLiveQuery() {
+  return useLiveQuery((q) =>
+    q.from({ presets: resultFilterPresetsCollection }),
+  );
+}
+
+type ActionType = {
+  insertResultFilterPreset: {
+    name: string;
+    filters: ResultFilters;
+  };
+  deleteResultFilterPreset: {
+    presetId: string;
+  };
+};
+
+const actions = {
+  insertResultFilterPreset: createOptimisticAction<
+    ActionType["insertResultFilterPreset"]
+  >({
+    onMutate: ({ name, filters }) => {
+      resultFilterPresetsCollection.insert({
+        ...structuredClone(filters),
+        _id: tempId(),
+        name,
+      });
+    },
+    mutationFn: async ({ name, filters }) => {
+      const response = await Ape.users.addResultFilterPreset({
+        body: {
+          ...structuredClone(filters),
+          name: replaceSpacesWithUnderscores(name),
+        },
+      });
+      if (response.status !== 200) {
+        throw new Error(
+          `Failed to insert result filter presets: ${response.body.message}`,
+        );
+      }
+
+      const newPreset: ResultFilters = {
+        ...structuredClone(filters),
+        _id: response.body.data,
+        name,
+      };
+
+      resultFilterPresetsCollection.utils.writeInsert(newPreset);
+    },
+  }),
+  deleteResultFilterPreset: createOptimisticAction<
+    ActionType["deleteResultFilterPreset"]
+  >({
+    onMutate: ({ presetId }) => {
+      resultFilterPresetsCollection.delete(presetId);
+    },
+    mutationFn: async ({ presetId }) => {
+      const response = await Ape.users.removeResultFilterPreset({
+        params: { presetId },
+      });
+
+      if (response.status !== 200) {
+        throw new Error(
+          `Failed to delete result filter presets: ${response.body.message}`,
+        );
+      }
+
+      resultFilterPresetsCollection.utils.writeDelete(presetId);
+    },
+  }),
+};
+
+export async function insertResultFilterPreset(
+  params: ActionType["insertResultFilterPreset"],
+): Promise<void> {
+  const transaction = actions.insertResultFilterPreset(params);
+  await transaction.isPersisted.promise;
+}
+
+export async function deleteResultFilterPreset(
+  params: ActionType["deleteResultFilterPreset"],
+): Promise<void> {
+  const transaction = actions.deleteResultFilterPreset(params);
+  await transaction.isPersisted.promise;
+}
+
+export function fillResultFilterPresetsCollection(
+  presets: ResultFilters[],
+): void {
+  resultFilterPresetsCollection.utils.writeBatch(() => {
+    presets
+      .map((it) => ({ ...it, name: replaceUnderscoresWithSpaces(it.name) }))
+      .forEach((it) => resultFilterPresetsCollection.utils.writeInsert(it));
+  });
+}
diff --git a/frontend/src/ts/collections/results.ts b/frontend/src/ts/collections/results.ts
new file mode 100644
index 000000000000..be252a51999f
--- /dev/null
+++ b/frontend/src/ts/collections/results.ts
@@ -0,0 +1,610 @@
+import { ResultMinified } from "@monkeytype/schemas/results";
+import { Difficulty, Mode, Mode2 } from "@monkeytype/schemas/shared";
+import { ResultFilters } from "@monkeytype/schemas/users";
+import { queryCollectionOptions } from "@tanstack/query-db-collection";
+import {
+  avg,
+  BTreeIndex,
+  count,
+  createCollection,
+  createOptimisticAction,
+  eq,
+  gte,
+  inArray,
+  length,
+  max,
+  not,
+  or,
+  Query,
+  queryOnce,
+  sum,
+  useLiveQuery,
+} from "@tanstack/solid-db";
+import { queryOptions } from "@tanstack/solid-query";
+import { Accessor } from "solid-js";
+import Ape from "../ape";
+import { SnapshotResult } from "../constants/default-snapshot";
+import { queryClient } from "../queries";
+import { baseKey } from "../queries/utils/keys";
+import { __nonReactive as tagsNonReactive, updateLocalTagPB } from "./tags";
+import { isAuthenticated } from "../states/core";
+import { createEffectOn } from "../hooks/effects";
+
+export type ResultsQueryState = {
+  difficulty: SnapshotResult<Mode>["difficulty"][];
+  pb: SnapshotResult<Mode>["isPb"][];
+  mode: SnapshotResult<Mode>["mode"][];
+  words: ("10" | "25" | "50" | "100" | "custom")[];
+  time: ("15" | "30" | "60" | "120" | "custom")[];
+  punctuation: SnapshotResult<Mode>["punctuation"][];
+  numbers: SnapshotResult<Mode>["numbers"][];
+  timestamp: SnapshotResult<Mode>["timestamp"];
+  quoteLength: SnapshotResult<Mode>["quoteLength"][];
+  tags: SnapshotResult<Mode>["tags"];
+  funbox: SnapshotResult<Mode>["funbox"];
+  language: SnapshotResult<Mode>["language"][];
+};
+
+const queryKeys = {
+  root: () => [...baseKey("results", { isUserSpecific: true })],
+  fullResult: (_id: string) => [...queryKeys.root(), _id],
+};
+
+export type ResultStats = {
+  words: number;
+  restarted: number;
+  completed: number;
+  maxWpm: number;
+  avgWpm: number;
+  maxRaw: number;
+  avgRaw: number;
+  maxAcc: number;
+  avgAcc: number;
+  maxConsistency: number;
+  avgConsistency: number;
+  timeTyping: number;
+  dayTimestamp?: number;
+};
+
+/**
+ * get aggregated statistics for the current result selection
+ * @param queryState
+ * @param options
+ * @returns
+ */
+// oxlint-disable-next-line typescript/explicit-function-return-type
+export function useResultStatsLiveQuery(
+  queryState: Accessor<ResultsQueryState | undefined>,
+  options?: { lastTen?: true } | { groupByDay?: true },
+) {
+  return useLiveQuery((q) => {
+    const state = queryState();
+    if (state === undefined) return undefined;
+
+    const isLastTen =
+      options !== undefined && "lastTen" in options && options.lastTen;
+    const isGroupByDay =
+      options !== undefined && "groupByDay" in options && options.groupByDay;
+
+    let query = isLastTen
+      ? //for lastTen we need a sub-query to apply the sort+limit first and then run the aggregations
+        q.from({
+          r: q
+            .from({ r: buildResultsQuery(state) })
+            .orderBy(({ r }) => r.timestamp, "desc")
+            .limit(10),
+        })
+      : q.from({ r: buildResultsQuery(state) });
+
+    if (isGroupByDay) {
+      query = query.groupBy(({ r }) => r.dayTimestamp);
+    }
+
+    return query.select(({ r }) => ({
+      dayTimestamp: isGroupByDay ? r.dayTimestamp : undefined,
+      words: sum(r.words),
+      completed: count(r._id),
+      restarted: sum(r.restartCount),
+      timeTyping: sum(r.timeTyping),
+      maxWpm: max(r.wpm),
+      avgWpm: avg(r.wpm),
+      maxRaw: max(r.rawWpm),
+      avgRaw: avg(r.rawWpm),
+      maxAcc: max(r.acc),
+      avgAcc: avg(r.acc),
+      maxConsistency: max(r.consistency),
+      avgConsistency: avg(r.consistency),
+    }));
+  });
+}
+
+// oxlint-disable-next-line typescript/explicit-function-return-type
+export async function getResultsQueryOnce(options: {
+  queryState: Accessor<ResultsQueryState | undefined>;
+  sorting: Accessor<{
+    field: keyof SnapshotResult<Mode>;
+    direction: "asc" | "desc";
+  }>;
+}) {
+  const state = options.queryState();
+  if (!state) return undefined;
+
+  const sorting = options.sorting();
+
+  return queryOnce((q) =>
+    q
+      .from({ r: buildResultsQuery(state) })
+      .orderBy(({ r }) => r[sorting.field], sorting.direction),
+  );
+}
+
+/**
+ * get list of SnapshotResults for the current result selection
+ * @param queryState
+ * @returns
+ */
+// oxlint-disable-next-line typescript/explicit-function-return-type
+export function useResultsLiveQuery(options: {
+  queryState: Accessor<ResultsQueryState | undefined>;
+  sorting: Accessor<{
+    field: keyof SnapshotResult<Mode>;
+    direction: "asc" | "desc";
+  }>;
+  limit: Accessor<number>;
+}) {
+  return useLiveQuery((q) => {
+    const state = options.queryState();
+    const sorting = options.sorting();
+    const limit = options.limit();
+    if (state === undefined) return undefined;
+
+    return q
+      .from({ r: buildResultsQuery(state) })
+      .orderBy(({ r }) => r[sorting.field], sorting.direction)
+      .limit(limit);
+  });
+}
+
+function normalizeResult(
+  result: ResultMinified | SnapshotResult<Mode>,
+  knownTagIds?: Set<string>,
+): SnapshotResult<Mode> {
+  const resultDate = new Date(result.timestamp);
+  resultDate.setSeconds(0);
+  resultDate.setMinutes(0);
+  resultDate.setHours(0);
+  resultDate.setMilliseconds(0);
+
+  // @ts-expect-error without this resorting the datatable causes wrong data e.g. tags to show up
+  result.id = result._id;
+
+  //results strip default values, add them back
+  result.bailedOut ??= false;
+  result.blindMode ??= false;
+  result.lazyMode ??= false;
+  result.difficulty ??= "normal";
+  result.funbox ??= [];
+  result.language ??= "english";
+  result.numbers ??= false;
+  result.punctuation ??= false;
+  result.quoteLength ??= -1;
+  result.restartCount ??= 0;
+  result.incompleteTestSeconds ??= 0;
+  result.afkDuration ??= 0;
+
+  result.tags ??= [];
+  if (knownTagIds !== undefined) {
+    result.tags = result.tags.filter((tagId) => knownTagIds.has(tagId));
+  }
+  result.isPb ??= false;
+  return {
+    ...result,
+    timeTyping: calcTimeTyping(result),
+    words: Math.round((result.wpm / 60) * result.testDuration),
+    dayTimestamp: resultDate.getTime(),
+  } as SnapshotResult<Mode>;
+}
+
+const resultsCollection = createCollection(
+  queryCollectionOptions({
+    staleTime: Infinity,
+    queryKey: queryKeys.root(),
+    queryFn: async () => {
+      if (!isAuthenticated()) return [];
+      const knownTagIds = new Set(
+        tagsNonReactive.getTags().map((it) => it._id),
+      );
+      //const options = parseLoadSubsetOptions(ctx.meta?.loadSubsetOptions);
+
+      const response = await Ape.results.get({
+        //query: { limit: options.limit },
+      });
+
+      if (response.status !== 200) {
+        throw new Error("Error fetching results:" + response.body.message);
+      }
+
+      return response.body.data.map((result) =>
+        normalizeResult(result, knownTagIds),
+      );
+    },
+    queryClient,
+    getKey: (it) => it._id,
+  }),
+);
+
+resultsCollection.createIndex((row) => row.timestamp, {
+  indexType: BTreeIndex,
+});
+
+type ActionType = {
+  updateTags: {
+    resultId: string;
+    currentTagIds: string[];
+    newTagIds: string[];
+    //TODO: remove when result page  is migrated to solidjs
+    afterUpdate?: (params: { tagPbs: string[] }) => void;
+  };
+  insertLocalResult: {
+    result: SnapshotResult<Mode>;
+  };
+};
+
+const actions = {
+  updateTags: createOptimisticAction<ActionType["updateTags"]>({
+    onMutate: ({ resultId, newTagIds }) => {
+      resultsCollection.update(resultId, (result) => {
+        result.tags = newTagIds;
+      });
+    },
+    mutationFn: async ({ resultId, currentTagIds, newTagIds, afterUpdate }) => {
+      const response = await Ape.results.updateTags({
+        body: { resultId, tagIds: newTagIds },
+      });
+      if (response.status !== 200) {
+        throw new Error(
+          `Failed to update result tag: ${response.body.message}`,
+        );
+      }
+      const results = getResults();
+      const result = results.find((it) => it._id === resultId);
+
+      if (result === undefined) {
+        throw new Error(`Cannot find result with id ${resultId}`);
+      }
+
+      const tagsToUpdate = [
+        ...currentTagIds.filter((tag) => !newTagIds.includes(tag)),
+        ...newTagIds.filter((tag) => !currentTagIds.includes(tag)),
+      ];
+      tagsToUpdate.forEach((tag) => {
+        updateLocalTagPB(
+          tag,
+          result.mode,
+          result.mode2,
+          result.punctuation,
+          result.numbers,
+          result.language,
+          result.difficulty,
+          result.lazyMode,
+          results,
+        );
+      });
+
+      resultsCollection.utils.writeUpdate({
+        _id: resultId,
+        tags: newTagIds,
+      });
+
+      afterUpdate?.({ tagPbs: response.body.data.tagPbs });
+    },
+  }),
+  insertLocalResult: createOptimisticAction<ActionType["insertLocalResult"]>({
+    onMutate: ({ result }) => {
+      resultsCollection.insert(result);
+    },
+    mutationFn: async ({ result }) => {
+      resultsCollection.utils.writeInsert(normalizeResult(result));
+    },
+  }),
+};
+// --- Public API ---
+export async function updateTags(
+  params: ActionType["updateTags"],
+): Promise<void> {
+  const transaction = actions.updateTags(params);
+  await transaction.isPersisted.promise;
+}
+
+export async function insertLocalResult(
+  params: ActionType["insertLocalResult"],
+): Promise<void> {
+  if (!resultsCollection.isReady()) {
+    //not loaded yet, don't need to insert
+    return;
+  }
+  const transaction = actions.insertLocalResult(params);
+  await transaction.isPersisted.promise;
+}
+
+// oxlint-disable-next-line typescript/explicit-function-return-type
+export function buildResultsQuery(state: ResultsQueryState) {
+  const applyMode2Filter = <T extends "time" | "words">(
+    key: T,
+    filter: ResultsQueryState[T],
+    nonCustomValues: string[],
+  ): void => {
+    if (filter.length === 5) return;
+    const isCustom = filter.includes("custom");
+    const selected = filter.filter((it) => it !== "custom");
+    query = query.where(({ r }) =>
+      or(
+        //results not matching the mode pass
+        not(eq(r.mode, key)),
+
+        //mode2 is matching one of the  selected mode2
+        inArray(r.mode2, selected),
+        //or if custom selected are not matching any non-custom value
+        isCustom ? not(inArray(r.mode2, nonCustomValues)) : false,
+      ),
+    );
+  };
+
+  let query = new Query()
+    .from({ r: resultsCollection })
+    .where(({ r }) => gte(r.timestamp, state.timestamp))
+    .where(({ r }) => inArray(r.difficulty, state.difficulty))
+    .where(({ r }) => inArray(r.isPb, state.pb))
+    .where(({ r }) => inArray(r.mode, state.mode))
+    .where(({ r }) => inArray(r.punctuation, state.punctuation))
+    .where(({ r }) => inArray(r.numbers, state.numbers))
+    .where(({ r }) => inArray(r.quoteLength, state.quoteLength))
+    .where(({ r }) => inArray(r.language, state.language))
+    .where(({ r }) =>
+      or(
+        false,
+        false,
+        ...state.tags.map((tag) =>
+          tag === "none" ? eq(length(r.tags), 0) : inArray(tag, r.tags),
+        ),
+      ),
+    )
+    .where(({ r }) =>
+      or(
+        false,
+        false,
+        ...state.funbox.map((fb) =>
+          (fb as string) === "none"
+            ? eq(length(r.funbox), 0)
+            : inArray(fb, r.funbox),
+        ),
+      ),
+    );
+  applyMode2Filter("time", state.time, ["15", "30", "60", "120"]);
+  applyMode2Filter("words", state.words, ["10", "25", "50", "100"]);
+
+  return query;
+}
+
+export function createResultsQueryState(
+  filters: ResultFilters,
+): ResultsQueryState {
+  return {
+    difficulty: valueFilter(filters.difficulty),
+    pb: boolFilter(filters.pb),
+    mode: valueFilter(filters.mode),
+    words: valueFilter(filters.words),
+    time: valueFilter(filters.time),
+    punctuation: boolFilter(filters.punctuation),
+    numbers: boolFilter(filters.numbers),
+    timestamp: timestampFilter(filters.date),
+    quoteLength: [
+      ...valueFilter(filters.quoteLength, {
+        short: 0,
+        medium: 1,
+        long: 2,
+        thicc: 3,
+      }),
+      -1, // fallback value for results without quoteLength, set in the collection
+    ],
+    tags: valueFilter(filters.tags),
+    funbox: valueFilter(filters.funbox),
+    language: valueFilter(filters.language),
+  };
+}
+
+function valueFilter<T extends string, U = T>(
+  val: Partial<Record<T, boolean>>,
+  mapping?: Record<T, U>,
+): U[] {
+  return Object.entries(val)
+    .filter(([_, v]) => v === true)
+    .map(([k]) => k as T)
+    .map((it) => (mapping ? mapping[it] : (it as unknown as U)));
+}
+
+function boolFilter(
+  val: Record<"on" | "off", boolean> | Record<"yes" | "no", boolean>,
+): boolean[] {
+  return Object.entries(val)
+    .filter(([_, v]) => v)
+    .map(([k]) => k === "on" || k === "yes");
+}
+
+function timestampFilter(val: ResultFilters["date"]): number {
+  const seconds =
+    valueFilter(val, {
+      all: 0,
+      last_day: 24 * 60 * 60,
+      last_week: 7 * 24 * 60 * 60,
+      last_month: 30 * 24 * 60 * 60,
+      last_3months: 90 * 24 * 60 * 60,
+    })[0] ?? 0;
+
+  if (seconds === 0) return 0;
+  return Math.floor(Date.now() - seconds * 1000);
+}
+
+function calcTimeTyping(result: ResultMinified): number {
+  let tt = 0;
+  if (
+    result.testDuration === undefined &&
+    result.mode2 !== "custom" &&
+    result.mode2 !== "zen"
+  ) {
+    //test finished before testDuration field was introduced - estimate
+    if (result.mode === "time") {
+      tt = parseInt(result.mode2);
+    } else if (result.mode === "words") {
+      tt = (parseInt(result.mode2) / result.wpm) * 60;
+    }
+  } else {
+    tt = parseFloat(result.testDuration as unknown as string); //legacy results could have a string here
+  }
+  if (result.incompleteTestSeconds !== undefined) {
+    tt += result.incompleteTestSeconds;
+  } else if (result.restartCount !== undefined && result.restartCount > 0) {
+    tt += (tt / 4) * result.restartCount;
+  }
+  return tt;
+}
+
+// oxlint-disable-next-line typescript/explicit-function-return-type
+export const getSingleResultQueryOptions = (_id: string) =>
+  queryOptions({
+    queryKey: queryKeys.fullResult(_id),
+    queryFn: async () => {
+      const response = await Ape.results.getById({ params: { resultId: _id } });
+
+      if (response.status !== 200) {
+        throw new Error(`Failed to load result: ${response.body.message}`);
+      }
+      return response.body.data;
+    },
+    staleTime: Infinity,
+  });
+
+export type CurrentSettingsFilter = {
+  mode: Mode;
+  mode2: Mode2<Mode>;
+  punctuation: boolean;
+  numbers: boolean;
+  language: string;
+  difficulty: Difficulty;
+  lazyMode: boolean;
+};
+
+export async function getUserAverage10(
+  options: CurrentSettingsFilter,
+): Promise<{ wpm: number; acc: number }> {
+  //exit early if there is no user. Don't init the result collection
+  if (!isAuthenticated()) return { wpm: 0, acc: 0 };
+
+  const result = await queryOnce(() =>
+    buildSettingsResultsQuery(options, {
+      tagIds: tagsNonReactive.getActiveTags().map((it) => it._id),
+    })
+      .orderBy(({ r }) => r.timestamp, "desc")
+      .limit(10)
+      .select(({ r }) => ({ wpm: avg(r.wpm), acc: avg(r.acc) })),
+  );
+
+  return result.length === 1 && result[0] !== undefined
+    ? result[0]
+    : { wpm: 0, acc: 0 };
+}
+
+export async function getUserDailyBest(
+  options: CurrentSettingsFilter,
+): Promise<{ wpm: number; acc: number }> {
+  //exit early if there is no user. Don't init the result collection
+  if (!isAuthenticated()) return { wpm: 0, acc: 0 };
+
+  const result = await queryOnce(() =>
+    buildSettingsResultsQuery(options, {
+      tagIds: tagsNonReactive.getActiveTags().map((it) => it._id),
+    })
+      .where(({ r }) => gte(r.timestamp, Date.now() - 24 * 60 * 60 * 1000))
+      .orderBy(({ r }) => r.wpm, "desc")
+      .limit(1)
+      .findOne(),
+  );
+
+  return result ?? { wpm: 0, acc: 0 };
+}
+
+// oxlint-disable-next-line typescript/explicit-function-return-type
+function buildSettingsResultsQuery(
+  filter: CurrentSettingsFilter,
+  options?: { tagIds?: string[] },
+) {
+  const tagIds = options?.tagIds;
+
+  let query = new Query()
+    .from({ r: resultsCollection })
+    .where(({ r }) => eq(r.mode, filter.mode))
+    .where(({ r }) => eq(r.mode2, filter.mode2))
+    .where(({ r }) => eq(r.punctuation, filter.punctuation))
+    .where(({ r }) => eq(r.numbers, filter.numbers))
+    .where(({ r }) => eq(r.language, filter.language))
+    .where(({ r }) => eq(r.difficulty, filter.difficulty))
+    .where(({ r }) => eq(r.lazyMode, filter.lazyMode));
+
+  if (tagIds !== undefined) {
+    query = query.where(({ r }) =>
+      or(
+        false,
+        tagIds.length === 0,
+        ...tagIds.map((it) => inArray(it, r.tags)),
+      ),
+    );
+  }
+
+  return query;
+}
+
+export function deleteLocalTag(tagId: string): void {
+  resultsCollection.utils.writeBatch(() => {
+    for (const result of [...resultsCollection.values()]) {
+      if (!result.tags.includes(tagId)) {
+        continue;
+      }
+
+      resultsCollection.utils.writeUpdate({
+        ...result,
+        tags: result.tags.filter((it) => it !== tagId),
+      });
+    }
+  });
+}
+
+export function isResultsReady(): boolean {
+  return resultsCollection.isReady();
+}
+
+export async function waitForResultsReady(): Promise<void> {
+  await resultsCollection.stateWhenReady();
+}
+
+export function getResultsSize(): number {
+  return resultsCollection.size;
+}
+
+/**
+ *
+ */
+createEffectOn(isAuthenticated, (hasUser) => {
+  if (hasUser) {
+    void resultsCollection.utils.refetch();
+  }
+});
+
+function getResults(): SnapshotResult<Mode>[] {
+  return [...resultsCollection.values()];
+}
+/**
+ * Used for non reactive access. Do not use in Solid components.
+ */
+export const __nonReactive = {
+  getResults,
+};
diff --git a/frontend/src/ts/collections/tags.ts b/frontend/src/ts/collections/tags.ts
new file mode 100644
index 000000000000..8e0b53ba1c75
--- /dev/null
+++ b/frontend/src/ts/collections/tags.ts
@@ -0,0 +1,488 @@
+import { UserTag } from "@monkeytype/schemas/users";
+import { queryCollectionOptions } from "@tanstack/query-db-collection";
+import {
+  createCollection,
+  createOptimisticAction,
+  useLiveQuery,
+} from "@tanstack/solid-db";
+import { z } from "zod";
+import Ape from "../ape";
+import { queryClient } from "../queries";
+import { baseKey } from "../queries/utils/keys";
+import { LocalStorageWithSchema } from "../utils/local-storage-with-schema";
+import { IdSchema } from "@monkeytype/schemas/util";
+import { SnapshotResult } from "../constants/default-snapshot";
+import {
+  Mode,
+  Mode2,
+  PersonalBest,
+  PersonalBests,
+} from "@monkeytype/schemas/shared";
+import { Difficulty } from "@monkeytype/schemas/configs";
+import { Language } from "@monkeytype/schemas/languages";
+import { tempId } from "./utils/misc";
+
+export type TagItem = UserTag & { active: boolean };
+
+const queryKeys = {
+  root: () => [...baseKey("tags", { isUserSpecific: true })],
+};
+
+const tagsCollection = createCollection(
+  queryCollectionOptions({
+    staleTime: Infinity,
+    startSync: true,
+    queryKey: queryKeys.root(),
+
+    queryClient,
+    getKey: (it) => it._id,
+    queryFn: async () => {
+      return [] as TagItem[];
+    },
+  }),
+);
+
+// oxlint-disable-next-line typescript/explicit-function-return-type
+export function useTagsLiveQuery() {
+  return useLiveQuery((q) => {
+    return q
+      .from({ tag: tagsCollection })
+      .orderBy(({ tag }) => tag.name, "asc");
+  });
+}
+
+type ActionType = {
+  insertTag: {
+    name: string;
+  };
+  updateTagName: {
+    tagId: string;
+    newName: string;
+  };
+  clearTagPBs: {
+    tagId: string;
+  };
+  deleteTag: {
+    tagId: string;
+  };
+};
+
+const actions = {
+  insertTag: createOptimisticAction<ActionType["insertTag"]>({
+    onMutate: ({ name }) => {
+      tagsCollection.insert({
+        _id: tempId(),
+        name: name.replace(/_/g, " "),
+        personalBests: { time: {}, words: {}, quote: {}, zen: {}, custom: {} },
+        active: false,
+      });
+    },
+    mutationFn: async ({ name }) => {
+      const response = await Ape.users.createTag({
+        body: { tagName: name.replace(/ /g, "_") },
+      });
+      if (response.status !== 200) {
+        throw new Error(`Failed to add tag: ${response.body.message}`);
+      }
+      const newTag = {
+        ...response.body.data,
+        name: response.body.data.name.replace(/_/g, " "),
+        active: false,
+      };
+
+      tagsCollection.utils.writeInsert(newTag);
+    },
+  }),
+  updateTagName: createOptimisticAction<ActionType["updateTagName"]>({
+    onMutate: ({ tagId, newName }) => {
+      tagsCollection.update(tagId, (tag) => {
+        tag.name = newName.replace(/_/g, " ");
+      });
+    },
+    mutationFn: async ({ tagId, newName }) => {
+      const response = await Ape.users.editTag({
+        body: { tagId, newName: newName.replace(/ /g, "_") },
+      });
+      if (response.status !== 200) {
+        throw new Error(`Failed to update tag: ${response.body.message}`);
+      }
+
+      tagsCollection.utils.writeUpdate({
+        _id: tagId,
+        name: newName.replace(/_/g, " "),
+      });
+    },
+  }),
+  clearTagPBs: createOptimisticAction<ActionType["clearTagPBs"]>({
+    onMutate: ({ tagId }) => {
+      tagsCollection.update(tagId, (tag) => {
+        tag.personalBests = {
+          time: {},
+          words: {},
+          quote: {},
+          zen: {},
+          custom: {},
+        };
+      });
+    },
+    mutationFn: async ({ tagId }) => {
+      const response = await Ape.users.deleteTagPersonalBest({
+        params: { tagId },
+      });
+      if (response.status !== 200) {
+        throw new Error(`Failed to clear tag PBs: ${response.body.message}`);
+      }
+
+      tagsCollection.utils.writeUpdate({
+        _id: tagId,
+        personalBests: {
+          time: {},
+          words: {},
+          quote: {},
+          zen: {},
+          custom: {},
+        },
+      });
+    },
+  }),
+  deleteTag: createOptimisticAction<ActionType["deleteTag"]>({
+    onMutate: ({ tagId }) => {
+      tagsCollection.delete(tagId);
+    },
+    mutationFn: async ({ tagId }) => {
+      const response = await Ape.users.deleteTag({
+        params: { tagId },
+      });
+      if (response.status !== 200) {
+        throw new Error(`Failed to delete tag: ${response.body.message}`);
+      }
+      tagsCollection.utils.writeDelete(tagId);
+    },
+  }),
+};
+
+// --- Public API ---
+
+export async function insertTag(
+  params: ActionType["insertTag"],
+): Promise<void> {
+  const transaction = actions.insertTag(params);
+  await transaction.isPersisted.promise;
+}
+
+export async function updateTagName(
+  params: ActionType["updateTagName"],
+): Promise<void> {
+  const transaction = actions.updateTagName(params);
+  await transaction.isPersisted.promise;
+}
+
+export async function clearTagPBs(
+  params: ActionType["clearTagPBs"],
+): Promise<void> {
+  const transaction = actions.clearTagPBs(params);
+  await transaction.isPersisted.promise;
+}
+
+export async function deleteTag(
+  params: ActionType["deleteTag"],
+): Promise<void> {
+  const transaction = actions.deleteTag(params);
+  await transaction.isPersisted.promise;
+}
+
+function getTags(): TagItem[] {
+  return [...tagsCollection.values()].sort((a, b) =>
+    a.name.localeCompare(b.name),
+  );
+}
+
+function getTag(id: string): TagItem | undefined {
+  return tagsCollection.get(id);
+}
+
+function getActiveTags(): TagItem[] {
+  return getTags().filter((tag) => tag.active);
+}
+
+export function fillTagsCollection(userTags: UserTag[]): void {
+  const activeIds = activeTagsLS.get();
+
+  const tagItems = userTags.map((tag) => ({
+    ...tag,
+    name: tag.name.replace(/_/g, " "),
+    active: activeIds.includes(tag._id),
+  }));
+
+  tagsCollection.utils.writeBatch(() => {
+    tagItems.forEach((item) => {
+      tagsCollection.utils.writeInsert(item);
+    });
+  });
+}
+
+// --- Active state ---
+
+const activeTagsLS = new LocalStorageWithSchema({
+  key: "activeTags",
+  schema: z.array(IdSchema),
+  fallback: [],
+});
+
+export function saveActiveToLocalStorage(): void {
+  const activeIds: string[] = [];
+  tagsCollection.forEach((t) => {
+    if (t.active) activeIds.push(t._id);
+  });
+  activeTagsLS.set(activeIds);
+}
+
+export function toggleTagActive(tagId: string, nosave = false): void {
+  const tag = tagsCollection.get(tagId);
+  if (tag === undefined) return;
+  tagsCollection.utils.writeUpdate({ ...tag, active: !tag.active });
+  if (!nosave) saveActiveToLocalStorage();
+}
+
+export function setTagActive(
+  tagId: string,
+  state: boolean,
+  nosave = false,
+): void {
+  const tag = tagsCollection.get(tagId);
+  if (tag === undefined) return;
+  tagsCollection.utils.writeUpdate({ ...tag, active: state });
+  if (!nosave) saveActiveToLocalStorage();
+}
+
+export function clearActiveTags(nosave = false): void {
+  tagsCollection.utils.writeBatch(() => {
+    tagsCollection.forEach((tag) => {
+      if (tag.active) {
+        tagsCollection.utils.writeUpdate({ ...tag, active: false });
+      }
+    });
+  });
+  if (!nosave) saveActiveToLocalStorage();
+}
+
+// --- Personal bests ---
+
+export function getLocalTagPB<M extends Mode>(
+  tagId: string,
+  mode: M,
+  mode2: Mode2<M>,
+  punctuation: boolean,
+  numbers: boolean,
+  language: string,
+  difficulty: Difficulty,
+  lazyMode: boolean,
+): number {
+  const tag = getTag(tagId);
+  if (tag === undefined) return 0;
+
+  const personalBests = (tag.personalBests?.[mode]?.[mode2] ??
+    []) as PersonalBest[];
+
+  return (
+    personalBests.find(
+      (pb) =>
+        (pb.punctuation ?? false) === punctuation &&
+        (pb.numbers ?? false) === numbers &&
+        pb.difficulty === difficulty &&
+        pb.language === language &&
+        (pb.lazyMode === lazyMode || (pb.lazyMode === undefined && !lazyMode)),
+    )?.wpm ?? 0
+  );
+}
+
+export function saveLocalTagPB<M extends Mode>(
+  tagId: string,
+  mode: M,
+  mode2: Mode2<M>,
+  punctuation: boolean,
+  numbers: boolean,
+  language: Language,
+  difficulty: Difficulty,
+  lazyMode: boolean,
+  wpm: number,
+  acc: number,
+  raw: number,
+  consistency: number,
+): void {
+  if (mode === "quote") return;
+
+  const collectionTag = tagsCollection.get(tagId);
+  if (collectionTag === undefined) return;
+  const tag = structuredClone(collectionTag);
+
+  tag.personalBests ??= {
+    time: {},
+    words: {},
+    quote: {},
+    zen: {},
+    custom: {},
+  };
+
+  tag.personalBests[mode] ??= {
+    [mode2]: [],
+  };
+
+  tag.personalBests[mode][mode2] ??=
+    [] as unknown as PersonalBests[M][Mode2<M>];
+
+  try {
+    let found = false;
+
+    (tag.personalBests[mode][mode2] as unknown as PersonalBest[]).forEach(
+      (pb) => {
+        if (
+          (pb.punctuation ?? false) === punctuation &&
+          (pb.numbers ?? false) === numbers &&
+          pb.difficulty === difficulty &&
+          pb.language === language &&
+          (pb.lazyMode === lazyMode || (pb.lazyMode === undefined && !lazyMode))
+        ) {
+          found = true;
+          pb.wpm = wpm;
+          pb.acc = acc;
+          pb.raw = raw;
+          pb.timestamp = Date.now();
+          pb.consistency = consistency;
+          pb.lazyMode = lazyMode;
+        }
+      },
+    );
+    if (!found) {
+      (tag.personalBests[mode][mode2] as unknown as PersonalBest[]).push({
+        language,
+        difficulty,
+        lazyMode,
+        punctuation,
+        numbers,
+        wpm,
+        acc,
+        raw,
+        timestamp: Date.now(),
+        consistency,
+      });
+    }
+  } catch {
+    tag.personalBests = {
+      time: {},
+      words: {},
+      quote: {},
+      zen: {},
+      custom: {},
+    };
+    tag.personalBests[mode][mode2] = [
+      {
+        language,
+        difficulty,
+        lazyMode,
+        punctuation,
+        numbers,
+        wpm,
+        acc,
+        raw,
+        timestamp: Date.now(),
+        consistency,
+      },
+    ] as unknown as PersonalBests[M][Mode2<M>];
+  }
+
+  // using utils.writeUpdate instead of collection.update because we dont need to send this to the API
+  // the result saving already updates the tag pb in the db
+  tagsCollection.utils.writeUpdate(tag);
+}
+
+export function updateLocalTagPB<M extends Mode>(
+  tagId: string,
+  mode: M,
+  mode2: Mode2<M>,
+  punctuation: boolean,
+  numbers: boolean,
+  language: Language,
+  difficulty: Difficulty,
+  lazyMode: boolean,
+  results: SnapshotResult<Mode>[],
+): void {
+  const tag = getTag(tagId);
+  if (tag === undefined) return;
+
+  const pb = {
+    wpm: 0,
+    acc: 0,
+    rawWpm: 0,
+    consistency: 0,
+  };
+
+  results.forEach((result) => {
+    if (result.tags.includes(tagId) && result.wpm > pb.wpm) {
+      if (
+        result.mode === mode &&
+        result.mode2 === mode2 &&
+        result.punctuation === punctuation &&
+        result.numbers === numbers &&
+        result.language === language &&
+        result.difficulty === difficulty &&
+        result.lazyMode === lazyMode
+      ) {
+        pb.wpm = result.wpm;
+        pb.acc = result.acc;
+        pb.rawWpm = result.rawWpm;
+        pb.consistency = result.consistency;
+      }
+    }
+  });
+
+  saveLocalTagPB(
+    tagId,
+    mode,
+    mode2,
+    punctuation,
+    numbers,
+    language,
+    difficulty,
+    lazyMode,
+    pb.wpm,
+    pb.acc,
+    pb.rawWpm,
+    pb.consistency,
+  );
+}
+
+export function getActiveTagsPB<M extends Mode>(
+  mode: M,
+  mode2: Mode2<M>,
+  punctuation: boolean,
+  numbers: boolean,
+  language: string,
+  difficulty: Difficulty,
+  lazyMode: boolean,
+): number {
+  let tagPbWpm = 0;
+  for (const tag of getActiveTags()) {
+    const currTagPB = getLocalTagPB(
+      tag._id,
+      mode,
+      mode2,
+      punctuation,
+      numbers,
+      language,
+      difficulty,
+      lazyMode,
+    );
+    if (currTagPB > tagPbWpm) tagPbWpm = currTagPB;
+  }
+  return tagPbWpm;
+}
+
+/**
+ * Used for non reactive access. Do not use in Solid components.
+ */
+export const __nonReactive = {
+  getTags,
+  getTag,
+  getActiveTags,
+};
diff --git a/frontend/src/ts/collections/utils/misc.ts b/frontend/src/ts/collections/utils/misc.ts
new file mode 100644
index 000000000000..6324263d72ca
--- /dev/null
+++ b/frontend/src/ts/collections/utils/misc.ts
@@ -0,0 +1,5 @@
+export function tempId(): string {
+  return (
+    "temp_" + Math.random().toString(36).slice(2) + Date.now().toString(36)
+  );
+}
diff --git a/frontend/src/ts/commandline/lists/tags.ts b/frontend/src/ts/commandline/lists/tags.ts
index 4ea7b7ea1792..677e993fc10f 100644
--- a/frontend/src/ts/commandline/lists/tags.ts
+++ b/frontend/src/ts/commandline/lists/tags.ts
@@ -1,7 +1,10 @@
-import * as DB from "../../db";
 import * as EditTagsPopup from "../../modals/edit-tag";
 import * as ModesNotice from "../../elements/modes-notice";
-import * as TagController from "../../controllers/tag-controller";
+import {
+  clearActiveTags,
+  toggleTagActive,
+  __nonReactive,
+} from "../../collections/tags";
 import { Config } from "../../config/store";
 import * as PaceCaret from "../../test/pace-caret";
 import { isAuthenticated } from "../../states/core";
@@ -28,30 +31,17 @@ const commands: Command[] = [
 ];
 
 function update(): void {
-  const snapshot = DB.getSnapshot();
+  const tags = __nonReactive.getTags();
   subgroup.list = [];
 
-  if (
-    snapshot !== undefined &&
-    snapshot.tags !== undefined &&
-    snapshot.tags.length > 0
-  ) {
+  if (tags.length > 0) {
     subgroup.list.push({
       id: "clearTags",
       display: `Clear tags`,
       icon: "fa-times",
       sticky: true,
       exec: async (): Promise<void> => {
-        const snapshot = DB.getSnapshot();
-        if (!snapshot) return;
-
-        snapshot.tags = snapshot.tags?.map((tag) => {
-          tag.active = false;
-
-          return tag;
-        });
-
-        DB.setSnapshot(snapshot);
+        clearActiveTags();
         if (
           Config.paceCaret === "average" ||
           Config.paceCaret === "tagPb" ||
@@ -60,23 +50,19 @@ function update(): void {
           await PaceCaret.init();
         }
         void ModesNotice.update();
-        TagController.saveActiveToLocalStorage();
       },
     });
 
-    for (const tag of snapshot.tags) {
+    for (const tag of tags) {
       subgroup.list.push({
         id: "toggleTag" + tag._id,
-        display: tag.display,
+        display: tag.name,
         sticky: true,
         active: () => {
-          return (
-            DB.getSnapshot()?.tags?.find((t) => t._id === tag._id)?.active ??
-            false
-          );
+          return __nonReactive.getTag(tag._id)?.active ?? false;
         },
         exec: async (): Promise<void> => {
-          TagController.toggle(tag._id);
+          toggleTagActive(tag._id);
 
           if (
             Config.paceCaret === "average" ||
@@ -97,7 +83,7 @@ function update(): void {
     shouldFocusTestUI: false,
     opensModal: true,
     exec: ({ commandlineModal }): void => {
-      EditTagsPopup.show("add", undefined, undefined, commandlineModal);
+      EditTagsPopup.show("add", undefined, commandlineModal);
     },
   });
 }
diff --git a/frontend/src/ts/components/common/Advertisement.tsx b/frontend/src/ts/components/common/Advertisement.tsx
new file mode 100644
index 000000000000..9a55f2bd68e7
--- /dev/null
+++ b/frontend/src/ts/components/common/Advertisement.tsx
@@ -0,0 +1,36 @@
+import { Ads } from "@monkeytype/schemas/configs";
+import { JSXElement, Show } from "solid-js";
+
+import { getConfig } from "../../config/store";
+
+export function Advertisement(props: {
+  id: "ad-account-1" | "ad-account-2" | "ad-about-1" | "ad-about-2";
+  visible: Ads | Ads[];
+}): JSXElement {
+  const isVisible = () =>
+    Array.isArray(props.visible)
+      ? props.visible.includes(getConfig.ads)
+      : props.visible === getConfig.ads;
+  return (
+    <Show when={isVisible()}>
+      <div
+        id={props.id + "-wrapper"}
+        class="ad full-width advertisement ad-h place-self-center"
+      >
+        <div class="icon">
+          <i class="fas fa-ad"></i>
+        </div>
+        <div id={props.id}></div>
+      </div>
+      <div
+        id={props.id + "-small-wrapper"}
+        class="ad advertisement ad-h-s place-self-center"
+      >
+        <div class="icon small">
+          <i class="fas fa-ad"></i>
+        </div>
+        <div id={props.id + "-small"}></div>
+      </div>
+    </Show>
+  );
+}
diff --git a/frontend/src/ts/components/common/AnimatedModal.tsx b/frontend/src/ts/components/common/AnimatedModal.tsx
index df29fe8f7904..5d1c627ad324 100644
--- a/frontend/src/ts/components/common/AnimatedModal.tsx
+++ b/frontend/src/ts/components/common/AnimatedModal.tsx
@@ -1,9 +1,9 @@
 import {
   JSXElement,
-  createEffect,
-  onCleanup,
   ParentProps,
   Show,
+  createEffect,
+  onCleanup,
 } from "solid-js";
 
 import { useRefWithUtils } from "../../hooks/useRefWithUtils";
@@ -77,12 +77,15 @@ export function AnimatedModal(props: AnimatedModalProps): JSXElement {
 
     await props.beforeShow?.(isChained);
 
+    // After await, the element may have been removed from the DOM
+    if (!dialogEl()?.native.isConnected) return;
+
     // Open the dialog
     dialogEl()?.show();
     if (props.mode === "dialog") {
       dialogEl()?.native.show();
     } else {
-      dialogEl()?.native.showModal();
+      dialogEl()?.native?.showModal();
     }
 
     const modalAnimDuration = applyReducedMotion(
diff --git a/frontend/src/ts/components/common/Kbd.tsx b/frontend/src/ts/components/common/Kbd.tsx
index 787d39954480..27c8a9752d34 100644
--- a/frontend/src/ts/components/common/Kbd.tsx
+++ b/frontend/src/ts/components/common/Kbd.tsx
@@ -1,4 +1,4 @@
-import { formatWithLabels, Hotkey } from "@tanstack/solid-hotkeys";
+import { formatForDisplay, Hotkey } from "@tanstack/solid-hotkeys";
 import { JSXElement } from "solid-js";
 
 type Props =
@@ -9,7 +9,9 @@ export function Kbd(props: Props): JSXElement {
   return (
     <kbd>
       {props.hotkey
-        ? formatWithLabels(props.hotkey).toLowerCase().replace(/\+/g, " + ")
+        ? formatForDisplay(props.hotkey, { useSymbols: false })
+            .toLowerCase()
+            .replace(/\+/g, " + ")
         : props.text}
     </kbd>
   );
diff --git a/frontend/src/ts/components/mount.tsx b/frontend/src/ts/components/mount.tsx
index 432c8c884f28..5d547416884c 100644
--- a/frontend/src/ts/components/mount.tsx
+++ b/frontend/src/ts/components/mount.tsx
@@ -12,6 +12,7 @@ import { Header } from "./layout/header/Header";
 import { Overlays } from "./layout/overlays/Overlays";
 import { Modals } from "./modals/Modals";
 import { AboutPage } from "./pages/AboutPage";
+import { AccountPage } from "./pages/account/AccountPage";
 import { MyProfile } from "./pages/account/MyProfile";
 import { LeaderboardPage } from "./pages/leaderboard/LeaderboardPage";
 import { LoginPage } from "./pages/login/LoginPage";
@@ -23,6 +24,7 @@ import { Popups } from "./popups/Popups";
 const components: Record<string, () => JSXElement> = {
   footer: () => <Footer />,
   aboutpage: () => <AboutPage />,
+  accountpage: () => <AccountPage />,
   loginpage: () => <LoginPage />,
   leaderboardpage: () => <LeaderboardPage />,
   profilepage: () => <ProfilePage />,
diff --git a/frontend/src/ts/components/pages/AboutPage.tsx b/frontend/src/ts/components/pages/AboutPage.tsx
index 29cdf9620978..9b626218ad18 100644
--- a/frontend/src/ts/components/pages/AboutPage.tsx
+++ b/frontend/src/ts/components/pages/AboutPage.tsx
@@ -1,7 +1,6 @@
 import { useQuery } from "@tanstack/solid-query";
-import { For, JSXElement, Show } from "solid-js";
+import { For, JSXElement } from "solid-js";
 
-import { getConfig } from "../../config/store";
 import {
   getContributorsQueryOptions,
   getSpeedHistogramQueryOptions,
@@ -12,10 +11,10 @@ import { getActivePage } from "../../states/core";
 import { showModal } from "../../states/modals";
 import { getTheme } from "../../states/theme";
 import { getNumberWithMagnitude } from "../../utils/numbers";
+import { Advertisement } from "../common/Advertisement";
 import AsyncContent from "../common/AsyncContent";
 import { Button } from "../common/Button";
 import { ChartJs } from "../common/ChartJs";
-import { Fa } from "../common/Fa";
 import { H2, H3 } from "../common/Headers";
 import { CommandlineHotkey } from "../hotkeys/CommandlineHotkey";
 import { QuickRestartHotkey } from "../hotkeys/QuickRestartHotkey";
@@ -248,26 +247,7 @@ export function AboutPage(): JSXElement {
           </dd>
         </dl>
       </section>
-      <Show when={getConfig.ads === "sellout"}>
-        <div
-          id="ad-about-1-wrapper"
-          class="ad full-width advertisement ad-h place-self-center"
-        >
-          <div class="icon">
-            <Fa icon="fa-ad" />
-          </div>
-          <div id="ad-about-1"></div>
-        </div>
-        <div
-          id="ad-about-1-small-wrapper"
-          class="ad advertisement ad-h-s place-self-center"
-        >
-          <div class="icon small">
-            <Fa icon="fa-ad" />
-          </div>
-          <div id="ad-about-1-small"></div>
-        </div>
-      </Show>
+      <Advertisement id="ad-about-1" visible="sellout" />
       <section>
         <H3 fa={{ icon: "fa-chart-area" }} text="results screen" />
         <p>
@@ -383,26 +363,7 @@ export function AboutPage(): JSXElement {
           themes and more
         </p>
       </section>
-      <Show when={getConfig.ads === "sellout"}>
-        <div
-          id="ad-about-2-wrapper"
-          class="ad full-width advertisement ad-h place-self-center"
-        >
-          <div class="icon">
-            <Fa icon="fa-ad" />
-          </div>
-          <div id="ad-about-2"></div>
-        </div>
-        <div
-          id="ad-about-2-small-wrapper"
-          class="ad advertisement ad-h-s place-self-center"
-        >
-          <div class="icon small">
-            <Fa icon="fa-ad" />
-          </div>
-          <div id="ad-about-2-small"></div>
-        </div>
-      </Show>
+      <Advertisement id="ad-about-2" visible="sellout" />
       <div></div>
       <section>
         <H2
diff --git a/frontend/src/ts/components/pages/account/AccountPage.tsx b/frontend/src/ts/components/pages/account/AccountPage.tsx
new file mode 100644
index 000000000000..a65511872362
--- /dev/null
+++ b/frontend/src/ts/components/pages/account/AccountPage.tsx
@@ -0,0 +1,140 @@
+import { Mode } from "@monkeytype/schemas/shared";
+import { createMemo, createSignal, JSXElement, Show } from "solid-js";
+
+import {
+  createResultsQueryState,
+  getResultsQueryOnce,
+  getResultsSize,
+  useResultsLiveQuery,
+} from "../../../collections/results";
+import { SnapshotResult } from "../../../constants/default-snapshot";
+import { getActivePage, isAuthenticated } from "../../../states/core";
+import { hideLoaderBar, showLoaderBar } from "../../../states/loader-bar";
+import { filters, setFilters } from "../../../states/result-filters";
+import { qs } from "../../../utils/dom";
+import { downloadResultsCSV } from "../../../utils/misc";
+import { Advertisement } from "../../common/Advertisement";
+import AsyncContent from "../../common/AsyncContent";
+import { Button } from "../../common/Button";
+import { Charts } from "./Charts";
+import { Filters } from "./Filters";
+import { MyProfile } from "./MyProfile";
+import { Table } from "./Table";
+import { TestStats } from "./TestStats";
+import { VerifyNotice } from "./VerifyNotice";
+
+export function AccountPage(): JSXElement {
+  const isOpen = (): boolean => getActivePage() === "account";
+  const [limit, setLimit] = createSignal(10);
+
+  const [sorting, setSorting] = createSignal<{
+    field: keyof SnapshotResult<Mode>;
+    direction: "asc" | "desc";
+  }>({
+    field: "timestamp",
+    direction: "desc",
+  });
+
+  const queryState = createMemo(() => {
+    if (!isOpen() || !isAuthenticated()) return undefined;
+
+    return createResultsQueryState(filters);
+  });
+
+  const [selectedResultId, setSelectedResultId] = createSignal<null | string>(
+    null,
+  );
+  const [isExporting, setIsExporting] = createSignal(false);
+
+  const resultsQuery = useResultsLiveQuery({ queryState, sorting, limit });
+
+  return (
+    <Show when={isAuthenticated() && isOpen()}>
+      <div class="flex flex-col gap-8">
+        <VerifyNotice />
+        <MyProfile />
+
+        <Advertisement id="ad-account-1" visible="sellout" />
+
+        <Filters filters={filters} onChangeFilters={setFilters} />
+
+        <Show
+          when={resultsQuery()?.length > 0}
+          fallback={
+            <div class="grid h-150 place-items-center">
+              <div>No data found. Check your filters.</div>
+            </div>
+          }
+        >
+          <>
+            <Charts
+              filters={filters}
+              queryState={queryState}
+              onHistoryChartClick={({ index, _id }) => {
+                const newLimit = Math.ceil(index / 10) * 10;
+                if (limit() < newLimit) {
+                  setLimit(newLimit);
+                }
+                setSelectedResultId(_id);
+
+                requestAnimationFrame(() => {
+                  qs(
+                    `#resultList tbody tr:nth-child(${index + 1})`,
+                  )?.scrollIntoView({
+                    block: "center",
+                  });
+                });
+              }}
+            />
+            <TestStats queryState={queryState} />
+
+            <div class="grid grid-cols-3">
+              <Button
+                text="Export CSV"
+                fa={{ icon: "fa-file-csv" }}
+                class="col-start-3 w-full"
+                disabled={isExporting()}
+                onClick={() => {
+                  setIsExporting(true);
+                  showLoaderBar();
+                  void getResultsQueryOnce({ queryState, sorting })
+                    .then(
+                      async (results) =>
+                        results !== undefined &&
+                        (await downloadResultsCSV(results)),
+                    )
+                    .finally(() => {
+                      hideLoaderBar();
+                      setIsExporting(false);
+                    });
+                }}
+              />
+            </div>
+
+            <Advertisement id="ad-account-2" visible="sellout" />
+
+            <AsyncContent collections={{ resultsQuery }}>
+              {({ resultsQueryData }) => (
+                <>
+                  <Table
+                    data={[...resultsQueryData()]}
+                    onSortingChange={(val) => setSorting(val)}
+                    selectedRowId={selectedResultId}
+                  />
+                  <Button
+                    text="load more"
+                    disabled={
+                      resultsQuery.isLoading || getResultsSize() < limit() + 10
+                    }
+                    onClick={() => setLimit((limit) => limit + 10)}
+                    class="w-full text-center"
+                  />
+                </>
+              )}
+            </AsyncContent>
+          </>
+        </Show>
+      </div>
+    </Show>
+  );
+}
diff --git a/frontend/src/ts/components/pages/account/Charts.tsx b/frontend/src/ts/components/pages/account/Charts.tsx
new file mode 100644
index 000000000000..4ae7cd06411b
--- /dev/null
+++ b/frontend/src/ts/components/pages/account/Charts.tsx
@@ -0,0 +1,140 @@
+import { ResultFilters, ResultFiltersKeys } from "@monkeytype/schemas/users";
+import { useLiveQuery } from "@tanstack/solid-db";
+import { Accessor, createMemo, JSXElement } from "solid-js";
+
+import {
+  buildResultsQuery,
+  ResultsQueryState,
+} from "../../../collections/results";
+import { type TagItem, useTagsLiveQuery } from "../../../collections/tags";
+import { getConfig } from "../../../config/store";
+import { FaSolidIcon } from "../../../types/font-awesome";
+import { Formatting } from "../../../utils/format";
+import {
+  capitalizeFirstLetter,
+  replaceUnderscoresWithSpaces,
+} from "../../../utils/strings";
+import { get as getTypingSpeedUnit } from "../../../utils/typing-speed-units";
+import AsyncContent from "../../common/AsyncContent";
+import { Fa } from "../../common/Fa";
+import { DailyActivityChart } from "./DailyActivityChart";
+import { HistogramChart } from "./HistogramChart";
+import { HistoryChart, HistoryChartClickEvent } from "./HistoryChart";
+
+export function Charts(props: {
+  filters: ResultFilters;
+  queryState: Accessor<ResultsQueryState | undefined>;
+  onHistoryChartClick?: (event: HistoryChartClickEvent) => void;
+}): JSXElement {
+  const beginAtZero = createMemo(() => getConfig.startGraphsAtZero);
+  const typingSpeedUnit = createMemo(() =>
+    getTypingSpeedUnit(getConfig.typingSpeedUnit),
+  );
+  const format = createMemo(() => new Formatting(getConfig));
+  const tags = useTagsLiveQuery();
+
+  const resultsQuery = useLiveQuery((q) => {
+    const state = props.queryState();
+    if (state === undefined) return undefined;
+    return q
+      .from({ r: buildResultsQuery(state) })
+      .orderBy(({ r }) => r.timestamp, "desc");
+  });
+
+  return (
+    <AsyncContent collections={{ resultsQuery }}>
+      {({ resultsQueryData }) => (
+        <div class="flex flex-col gap-8">
+          <div>
+            <FilterSummary filters={props.filters} tags={tags()} />
+            <HistoryChart
+              results={resultsQueryData()}
+              beginAtZero={beginAtZero()}
+              typingSpeedUnit={typingSpeedUnit()}
+              format={format()}
+              onClick={(index) => props.onHistoryChartClick?.(index)}
+            />
+          </div>
+
+          <HistogramChart
+            results={resultsQueryData()}
+            typingSpeedUnit={typingSpeedUnit()}
+          />
+
+          <DailyActivityChart
+            queryState={props.queryState}
+            beginAtZero={beginAtZero()}
+            typingSpeedUnit={typingSpeedUnit()}
+            format={format()}
+          />
+        </div>
+      )}
+    </AsyncContent>
+  );
+}
+
+function FilterSummary(props: {
+  filters: ResultFilters;
+  tags: TagItem[];
+}): JSXElement {
+  const Item = <
+    T extends ResultFiltersKeys,
+    K extends keyof ResultFilters[T],
+  >(options: {
+    group: T;
+    icon: FaSolidIcon;
+    format?: (val: K) => string;
+  }): JSXElement => {
+    const values = createMemo(() =>
+      isAllSet(props.filters[options.group])
+        ? "all"
+        : Object.entries(props.filters[options.group])
+            .filter(([_, v]) => v)
+            .map(([it]) => options.format?.(it as K) ?? it)
+            .join(", "),
+    );
+
+    return (
+      <span
+        aria-label={capitalizeFirstLetter(options.group)}
+        data-balloon-pos="up"
+      >
+        <Fa icon={options.icon} fixedWidth />
+        {values()}
+      </span>
+    );
+  };
+
+  return (
+    <div class="mt-4 mb-4 flex flex-wrap justify-center gap-4 text-sub [&>span>i]:mr-1">
+      <Item
+        group="date"
+        icon="fa-calendar"
+        format={replaceUnderscoresWithSpaces}
+      />
+      <Item group="mode" icon="fa-bars" />
+      <Item group="time" icon="fa-clock" />
+      <Item group="words" icon="fa-font" />
+      <Item group="difficulty" icon="fa-star" />
+      <Item group="punctuation" icon="fa-at" />
+      <Item group="numbers" icon="fa-hashtag" />
+      <Item group="language" icon="fa-globe-americas" />
+      <Item
+        group="funbox"
+        icon="fa-gamepad"
+        format={replaceUnderscoresWithSpaces}
+      />
+      <Item
+        group="tags"
+        icon="fa-tags"
+        format={(tag) => props.tags.find((it) => it._id === tag)?.name ?? tag}
+      />
+    </div>
+  );
+}
+
+function isAllSet(
+  filter: Record<string | number | symbol, boolean | undefined>,
+): boolean {
+  return Object.values(filter).every((value) => value);
+}
diff --git a/frontend/src/ts/components/pages/account/DailyActivityChart.tsx b/frontend/src/ts/components/pages/account/DailyActivityChart.tsx
new file mode 100644
index 000000000000..a214ebc91d45
--- /dev/null
+++ b/frontend/src/ts/components/pages/account/DailyActivityChart.tsx
@@ -0,0 +1,184 @@
+import { roundTo2 } from "@monkeytype/util/numbers";
+import { TooltipItem } from "chart.js";
+import { format as dateFormat } from "date-fns/format";
+import { Accessor, JSXElement } from "solid-js";
+
+import {
+  ResultsQueryState,
+  useResultStatsLiveQuery,
+} from "../../../collections/results";
+import { getTheme } from "../../../states/theme";
+import { secondsToString } from "../../../utils/date-and-time";
+import { Formatting } from "../../../utils/format";
+import { TypingSpeedUnitSettings } from "../../../utils/typing-speed-units";
+import AsyncContent from "../../common/AsyncContent";
+import { ChartJs } from "../../common/ChartJs";
+
+export function DailyActivityChart(props: {
+  queryState: Accessor<ResultsQueryState | undefined>;
+  beginAtZero: boolean;
+  typingSpeedUnit: TypingSpeedUnitSettings;
+  format: Formatting;
+}): JSXElement {
+  const dataQuery = useResultStatsLiveQuery(() => props.queryState(), {
+    groupByDay: true,
+  });
+
+  const formatSpeed = (wpm: number): string =>
+    props.format.typingSpeed(wpm, { showDecimalPlaces: true });
+
+  return (
+    <AsyncContent collections={{ dataQuery }}>
+      {({ dataQueryData }) => (
+        <div style={{ height: "200px" }}>
+          <ChartJs
+            name="DailyActivity"
+            type="bar"
+            data={{
+              labels: dataQueryData().map((it) => it.dayTimestamp),
+              datasets: [
+                {
+                  yAxisID: "count",
+                  data: dataQueryData().map((it) => it.timeTyping / 60),
+                  backgroundColor: getTheme().main,
+                  trendlineLinear: {
+                    lineStyle: "dotted",
+                    width: 2,
+                    //@ts-expect-error colorMin and colorMax missing from the type definition
+                    colorMin: getTheme().sub,
+                    colorMax: getTheme().sub,
+                  },
+                  order: 3,
+                },
+                {
+                  yAxisID: "avgWpm",
+                  data: dataQueryData().map((it) =>
+                    props.typingSpeedUnit.fromWpm(it.avgWpm),
+                  ),
+                  borderColor: getTheme().sub,
+                  pointBackgroundColor: getTheme().sub,
+                  type: "line",
+                  order: 2,
+                  tension: 0,
+                  fill: false,
+                },
+              ],
+            }}
+            options={{
+              responsive: true,
+              maintainAspectRatio: false,
+              hover: {
+                mode: "nearest",
+                intersect: false,
+              },
+              scales: {
+                x: {
+                  axis: "x",
+                  ticks: {
+                    autoSkip: true,
+                    autoSkipPadding: 20,
+                  },
+                  type: "time",
+                  time: {
+                    unit: "day",
+                    displayFormats: {
+                      day: "d MMM",
+                    },
+                  },
+                  bounds: "ticks",
+                  display: true,
+                  title: {
+                    display: false,
+                    text: "Date",
+                  },
+                  offset: true,
+                },
+                count: {
+                  axis: "y",
+                  beginAtZero: true,
+                  min: 0,
+                  ticks: {
+                    autoSkip: true,
+                    autoSkipPadding: 20,
+                    stepSize: 1,
+                  },
+                  display: true,
+                  title: {
+                    display: true,
+                    text: "Time typing (minutes)",
+                  },
+                  grid: { display: false },
+                },
+                avgWpm: {
+                  axis: "y",
+                  beginAtZero: props.beginAtZero,
+                  ticks: {
+                    autoSkip: true,
+                    autoSkipPadding: 20,
+                    stepSize: 10,
+                  },
+                  display: true,
+                  position: "right",
+                  title: {
+                    display: true,
+                    text:
+                      "Average " + props.format.typingSpeedUnit.toUpperCase(),
+                  },
+                  grid: {
+                    display: false,
+                  },
+                },
+              },
+              plugins: {
+                annotation: {
+                  annotations: [],
+                },
+                tooltip: {
+                  animation: { duration: 250 },
+                  intersect: false,
+                  mode: "index",
+                  filter: (tooltipItem): boolean => {
+                    return tooltipItem.datasetIndex === 0;
+                  },
+
+                  callbacks: {
+                    title: function (tooltipItem): string {
+                      const firstItem = tooltipItem[0] as TooltipItem<
+                        "bar" | "line"
+                      >;
+
+                      const item = dataQueryData()[firstItem.dataIndex];
+                      if (item === undefined) return "unknown";
+
+                      return dateFormat(
+                        new Date(item.dayTimestamp as number),
+                        "dd MMM yyyy",
+                      );
+                    },
+                    beforeLabel: function (tooltipItem): string {
+                      const item = dataQueryData()[tooltipItem.dataIndex];
+                      if (item === undefined) return "unknown";
+
+                      return `
+Time Typing: ${secondsToString(Math.round(item.timeTyping), true, true)}
+Tests Completed: ${item.completed}
+Restarts per test: ${roundTo2(item.restarted / item.completed)}
+Highest  ${props.format.typingSpeedUnit.toUpperCase()}: ${formatSpeed(item.maxWpm)}
+Average ${props.format.typingSpeedUnit.toUpperCase()}: ${formatSpeed(item.avgWpm)}
+Average Accuracy: ${props.format.accuracy(item.avgAcc, { showDecimalPlaces: true })}
+Average Consistency: ${props.format.percentage(item.avgConsistency, { showDecimalPlaces: true })}
+                      `;
+                    },
+                    label: function (): string {
+                      return "";
+                    },
+                  },
+                },
+              },
+            }}
+          />
+        </div>
+      )}
+    </AsyncContent>
+  );
+}
diff --git a/frontend/src/ts/components/pages/account/Filters.tsx b/frontend/src/ts/components/pages/account/Filters.tsx
new file mode 100644
index 000000000000..b15dcbd8f7ed
--- /dev/null
+++ b/frontend/src/ts/components/pages/account/Filters.tsx
@@ -0,0 +1,465 @@
+import { QuoteLength } from "@monkeytype/schemas/configs";
+import {
+  ResultFilterPresetNameSchema,
+  ResultFilters,
+  ResultFiltersGroupItem,
+  ResultFiltersKeys,
+} from "@monkeytype/schemas/users";
+import { createMemo, createSignal, For, JSXElement, Show } from "solid-js";
+import { SetStoreFunction, unwrap } from "solid-js/store";
+
+import {
+  deleteResultFilterPreset,
+  insertResultFilterPreset,
+  useResultFilterPresetsLiveQuery,
+} from "../../../collections/result-filter-presets";
+import { type TagItem, useTagsLiveQuery } from "../../../collections/tags";
+import { getConfig } from "../../../config/store";
+import defaultResultFilters from "../../../constants/default-result-filters";
+import { SimpleModal } from "../../../elements/simple-modal";
+import { FaSolidIcon } from "../../../types/font-awesome";
+import { IsValidResponse } from "../../../types/validation";
+import { createErrorMessage } from "../../../utils/error";
+import {
+  getLanguageDisplayString,
+  normalizeName,
+  replaceUnderscoresWithSpaces,
+} from "../../../utils/strings";
+import { AnimeShow } from "../../common/anime";
+import AsyncContent from "../../common/AsyncContent";
+import { Button } from "../../common/Button";
+import { H3 } from "../../common/Headers";
+import { Separator } from "../../common/Separator";
+import SlimSelect from "../../ui/SlimSelect";
+import { verifyResultFiltersStructure } from "./utils";
+
+const presetNameValidation = async (
+  tagName: string,
+): Promise<IsValidResponse> => {
+  const validationResult = ResultFilterPresetNameSchema.safeParse(
+    normalizeName(tagName),
+  );
+  if (validationResult.success) return true;
+  return validationResult.error.errors.map((err) => err.message).join(", ");
+};
+const newFilterPresetModal = new SimpleModal({
+  id: "newFilterPresetModal",
+  title: "New Filter Preset",
+  inputs: [
+    {
+      placeholder: "Preset Name",
+      type: "text",
+      initVal: "",
+      validation: {
+        isValid: presetNameValidation,
+        debounceDelay: 0,
+      },
+    },
+  ],
+  buttonText: "add",
+  execFn: async (thisPopup, name) => {
+    const filters = thisPopup.context as ResultFilters;
+
+    try {
+      await insertResultFilterPreset({ name: normalizeName(name), filters });
+      return { status: "success", message: "Filter preset created" };
+    } catch (e) {
+      const message = createErrorMessage(e, "Error creating filter preset");
+      return { status: "error", message };
+    }
+  },
+});
+
+const deleteResultFilterPresetModal = new SimpleModal({
+  id: "removeFilterPresetModal",
+  title: "Delete Filter Preset",
+  buttonText: "delete",
+  beforeInitFn: (thisPopup) => {
+    thisPopup.text = `Are you sure you want to delete preset ${thisPopup.parameters[1]}?`;
+  },
+  execFn: async (thisPopup) => {
+    try {
+      await deleteResultFilterPreset({
+        presetId: thisPopup.parameters[0] as string,
+      });
+      return { status: "success", message: `Filter preset removed` };
+    } catch (e) {
+      const message = createErrorMessage(e, "Error deleting filter preset");
+      return { status: "error", message };
+    }
+  },
+});
+
+export function Filters(props: {
+  filters: ResultFilters;
+  onChangeFilters: SetStoreFunction<ResultFilters>;
+}): JSXElement {
+  const FilterPresets = (props: {
+    presets: ResultFilters[];
+    onChangeFilters: SetStoreFunction<ResultFilters>;
+  }): JSXElement => {
+    return (
+      <Show when={props.presets.length > 0}>
+        <div>
+          <H3 fa={{ icon: "fa-sliders-h" }} text="filter presets" />
+          <div class="grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4">
+            <For each={props.presets}>
+              {(preset) => (
+                <div class="flex w-full flex-row gap-2">
+                  <Button
+                    class="w-full"
+                    text={replaceUnderscoresWithSpaces(preset.name)}
+                    onClick={() =>
+                      props.onChangeFilters(
+                        verifyResultFiltersStructure(unwrap(preset)),
+                      )
+                    }
+                  />
+                  <Button
+                    fa={{ icon: "fa-trash", fixedWidth: true }}
+                    onClick={() =>
+                      deleteResultFilterPresetModal.show(
+                        [preset._id, preset.name],
+                        {},
+                      )
+                    }
+                  />
+                </div>
+              )}
+            </For>
+          </div>
+        </div>
+      </Show>
+    );
+  };
+
+  const Dropdown = <
+    T extends ResultFiltersKeys,
+    K extends keyof ResultFilters[T],
+  >(options: {
+    icon: FaSolidIcon;
+    text: string;
+    group: T;
+    format?: (value: K) => string;
+  }): JSXElement => {
+    // Isolate this group's data to prevent unnecessary updates
+    const groupData = createMemo(() => props.filters[options.group]);
+
+    const dropdownOptions = createMemo(() =>
+      Object.keys(groupData()).map((k) => ({
+        value: k,
+        text: options.format?.(k as K) ?? k,
+      })),
+    );
+
+    const dropdownSelected = createMemo(() =>
+      Object.entries(groupData())
+        .filter(([, v]) => v)
+        .map(([k]) => k),
+    );
+
+    return (
+      <div>
+        <H3 fa={{ icon: options.icon, fixedWidth: true }} text={options.text} />
+        <SlimSelect
+          multiple
+          settings={{
+            showSearch: true,
+            placeholderText: "select a " + options.group,
+            allowDeselect: true,
+            closeOnSelect: false,
+            maxValuesShown: 4,
+            addAllOption: true,
+            scrollToTop: true,
+          }}
+          onChange={(selectedValues) => {
+            setFilter(
+              options.group,
+              Object.fromEntries(
+                Object.entries(props.filters[options.group]).map(([k]) => [
+                  k,
+                  selectedValues.includes(k),
+                ]),
+              ),
+            );
+          }}
+          options={dropdownOptions()}
+          selected={dropdownSelected()}
+        />
+      </div>
+    );
+  };
+
+  const ButtonGroup = <
+    T extends ResultFiltersKeys,
+    K extends keyof ResultFilters[T],
+  >(options: {
+    icon?: FaSolidIcon;
+    text?: string;
+    group: T;
+    format?: (value: K) => string;
+    classOverride?: string;
+    singleSelect?: true;
+  }): JSXElement => {
+    const items = (): { id: K; text: string }[] =>
+      Object.keys(props.filters[options.group]).map((id) => ({
+        id,
+        text: options.format?.(id as K) ?? new String(id).toString(),
+      })) as { id: K; text: string }[];
+
+    return (
+      <div>
+        <Show when={options.icon !== undefined && options.text !== undefined}>
+          <H3
+            fa={{ icon: options.icon as FaSolidIcon, fixedWidth: true }}
+            text={options.text as string}
+          />
+        </Show>
+        <div
+          class={
+            options.classOverride ??
+            "flex justify-evenly gap-2 [&>button]:w-full [&>button]:last:col-span-2"
+          }
+        >
+          <For each={items()}>
+            {(item) => (
+              <Button
+                text={item.text ?? (item.id as string)}
+                active={props.filters[options.group][item.id] === true}
+                onClick={(e) => {
+                  if (e.shiftKey || options.singleSelect) {
+                    const newValue = Object.fromEntries(
+                      Object.entries(props.filters[options.group]).map(
+                        ([key]) => [key, key === item.id],
+                      ),
+                    );
+                    setFilter(options.group, newValue);
+                  } else {
+                    setFilter(options.group, {
+                      ...(props.filters[options.group] as Record<
+                        string,
+                        boolean
+                      >),
+                      // oxlint-disable-next-line typescript/strict-boolean-expressions
+                      [item.id]: !props.filters[options.group][item.id],
+                    });
+                  }
+                }}
+              />
+            )}
+          </For>
+        </div>
+      </div>
+    );
+  };
+
+  const tags = useTagsLiveQuery();
+  const [isShowAdvanced, setShowAdvanced] = createSignal(false);
+
+  const setFilter = (
+    key: ResultFiltersKeys,
+    value: Record<string, boolean>,
+  ) => {
+    props.onChangeFilters(key, value);
+  };
+
+  const presetsQuery = useResultFilterPresetsLiveQuery();
+
+  return (
+    <div class="flex flex-col gap-8">
+      <AsyncContent collections={{ presetsQuery }}>
+        {({ presetsQueryData }) => (
+          <FilterPresets
+            presets={presetsQueryData()}
+            onChangeFilters={props.onChangeFilters}
+          />
+        )}
+      </AsyncContent>
+      <div>
+        <H3 fa={{ icon: "fa-filter" }} text="filters" />
+        <div class="mb-4 grid gap-4 sm:grid-cols-2 lg:flex lg:justify-evenly [&>button]:w-full">
+          <Button
+            text="all"
+            onClick={() => props.onChangeFilters(fromDefaultSettings(tags()))}
+          />
+          <Button
+            text="current settings"
+            onClick={() => props.onChangeFilters(fromCurrentSettings(tags()))}
+          />
+          <Button
+            text="advanced"
+            active={isShowAdvanced()}
+            onClick={() => setShowAdvanced((old) => !old)}
+          />
+          <Button
+            text="save as preset"
+            onClick={() =>
+              newFilterPresetModal.show(undefined, {
+                context: { ...unwrap(props.filters), _id: "tmp" },
+              })
+            }
+          />
+        </div>
+        <Separator class="mb-4 block lg:hidden" />
+        <ButtonGroup
+          singleSelect
+          classOverride="grid gap-4 sm:grid-cols-2 lg:flex lg:justify-evenly [&>button]:w-full [&>button]:last:col-span-2"
+          group="date"
+          format={(val) => {
+            if (val === "all") return "all time";
+            if (val === "last_3months") return "last 3 months";
+            return replaceUnderscoresWithSpaces(val);
+          }}
+        />
+
+        <AnimeShow when={isShowAdvanced()} slide>
+          <H3 fa={{ icon: "fa-tools" }} text="advanced filters" class="mt-8" />
+
+          <Button
+            text="clear filters"
+            onClick={() => props.onChangeFilters(noFilters())}
+            class="mb-4 w-full"
+          />
+          <div class="gap-4 md:grid md:grid-cols-2 [&>div]:last:col-span-2">
+            <ButtonGroup text="difficulty" icon="fa-star" group="difficulty" />
+            <ButtonGroup text="personal best" icon="fa-crown" group="pb" />
+            <ButtonGroup text="mode" icon="fa-bars" group="mode" />
+            <ButtonGroup
+              text="quote length"
+              icon="fa-quote-right"
+              group="quoteLength"
+            />
+            <ButtonGroup text="words" icon="fa-font" group="words" />
+            <ButtonGroup text="time" icon="fa-clock" group="time" />
+            <ButtonGroup text="punctuation" icon="fa-at" group="punctuation" />
+            <ButtonGroup text="numbers" icon="fa-hashtag" group="numbers" />
+
+            <Dropdown
+              icon="fa-tag"
+              text="tags"
+              group="tags"
+              format={(tag) =>
+                tag === "none"
+                  ? "no tag"
+                  : (tags().find((it) => it._id === tag)?.name ?? tag)
+              }
+            />
+            <Dropdown
+              icon="fa-gamepad"
+              text="funbox"
+              group="funbox"
+              format={(val) =>
+                val === "none" ? "no funbox" : replaceUnderscoresWithSpaces(val)
+              }
+            />
+            <Dropdown
+              icon="fa-globe-americas"
+              text="language"
+              group="language"
+              format={getLanguageDisplayString}
+            />
+          </div>
+        </AnimeShow>
+      </div>
+    </div>
+  );
+}
+
+function noFilters(): ResultFilters {
+  const filters = structuredClone(defaultResultFilters);
+  Object.entries(filters)
+    .filter(([key, value]) => key !== "date" && typeof value === "object")
+    .map(([_, value]) => value as Record<string, boolean>)
+    .forEach((group) =>
+      Object.keys(group).forEach((it) => (group[it] = false)),
+    );
+
+  return filters;
+}
+
+function fromCurrentSettings(tags: TagItem[]): ResultFilters {
+  const filters = noFilters();
+
+  filters.pb.no = true;
+  filters.pb.yes = true;
+
+  filters.difficulty[getConfig.difficulty] = true;
+  filters.mode[getConfig.mode] = true;
+  if (getConfig.mode === "time") {
+    if ([15, 30, 60, 120].includes(getConfig.time)) {
+      const configTime = `${getConfig.time}` as keyof typeof filters.time;
+      filters.time[configTime] = true;
+    } else {
+      filters.time.custom = true;
+    }
+  } else if (getConfig.mode === "words") {
+    if ([10, 25, 50, 100, 200].includes(getConfig.words)) {
+      const configWords = `${getConfig.words}` as keyof typeof filters.words;
+      filters.words[configWords] = true;
+    } else {
+      filters.words.custom = true;
+    }
+  } else if (getConfig.mode === "quote") {
+    const filterName: ResultFiltersGroupItem<"quoteLength">[] = [
+      "short",
+      "medium",
+      "long",
+      "thicc",
+    ];
+    filterName.forEach((ql, index) => {
+      if (getConfig.quoteLength.includes(index as QuoteLength)) {
+        filters.quoteLength[ql] = true;
+      } else {
+        filters.quoteLength[ql] = false;
+      }
+    });
+  }
+  if (getConfig.punctuation) {
+    filters.punctuation.on = true;
+  } else {
+    filters.punctuation.off = true;
+  }
+  if (getConfig.numbers) {
+    filters.numbers.on = true;
+  } else {
+    filters.numbers.off = true;
+  }
+  if (getConfig.mode === "quote" && /english.*/.test(getConfig.language)) {
+    filters.language["english"] = true;
+  } else {
+    filters.language[getConfig.language] = true;
+  }
+
+  if (getConfig.funbox.length === 0) {
+    filters.funbox["none"] = true;
+  } else {
+    for (const f of getConfig.funbox) {
+      filters.funbox[f] = true;
+    }
+  }
+
+  filters.tags["none"] = true;
+
+  tags.forEach((tag) => {
+    if (tag.active) {
+      filters.tags["none"] = false;
+      filters.tags[tag._id] = true;
+    }
+  });
+
+  filters.date.all = true;
+
+  return filters;
+}
+
+function fromDefaultSettings(tags: TagItem[]): ResultFilters {
+  const tagFilters: Record<string, boolean> = {};
+  tagFilters["none"] = true;
+  tags.forEach((tag) => {
+    tagFilters[tag._id] = true;
+  });
+  return {
+    ...defaultResultFilters,
+    tags: tagFilters,
+  };
+}
diff --git a/frontend/src/ts/components/pages/account/HistogramChart.tsx b/frontend/src/ts/components/pages/account/HistogramChart.tsx
new file mode 100644
index 000000000000..16968f4579e3
--- /dev/null
+++ b/frontend/src/ts/components/pages/account/HistogramChart.tsx
@@ -0,0 +1,109 @@
+import { Mode } from "@monkeytype/schemas/shared";
+import { createMemo, JSXElement } from "solid-js";
+
+import { SnapshotResult } from "../../../constants/default-snapshot";
+import { getTheme } from "../../../states/theme";
+import { TypingSpeedUnitSettings } from "../../../utils/typing-speed-units";
+import { ChartJs } from "../../common/ChartJs";
+
+export function HistogramChart(props: {
+  results: SnapshotResult<Mode>[];
+  typingSpeedUnit: TypingSpeedUnitSettings;
+}): JSXElement {
+  const buckets = createMemo(() =>
+    groupIntoBuckets(
+      props.results.map((it) => props.typingSpeedUnit.fromWpm(it.wpm)),
+      props.typingSpeedUnit.histogramDataBucketSize,
+    ),
+  );
+
+  return (
+    <div style={{ height: "200px" }}>
+      <ChartJs
+        name="Histogram"
+        type="bar"
+        data={{
+          datasets: [
+            {
+              label: "Tests",
+              data: buckets(),
+              backgroundColor: getTheme().main,
+              borderColor: getTheme().main,
+            },
+          ],
+        }}
+        options={{
+          responsive: true,
+          maintainAspectRatio: false,
+          hover: {
+            mode: "nearest",
+            intersect: false,
+          },
+          scales: {
+            x: {
+              axis: "x",
+              bounds: "ticks",
+              display: true,
+              title: {
+                display: false,
+                text: "Bucket",
+              },
+            },
+            y: {
+              axis: "y",
+              beginAtZero: true,
+              ticks: {
+                autoSkip: true,
+                autoSkipPadding: 20,
+                stepSize: 10,
+              },
+              display: true,
+              title: {
+                display: true,
+                text: "Tests",
+              },
+            },
+          },
+          plugins: {
+            annotation: {
+              annotations: [],
+            },
+            tooltip: {
+              animation: { duration: 250 },
+              intersect: false,
+              mode: "index",
+            },
+          },
+        }}
+      />
+    </div>
+  );
+}
+function groupIntoBuckets(
+  arr: number[],
+  bucketSize: number,
+): { x: string; y: number }[] {
+  if (arr.length === 0) return [];
+  const buckets: Record<number, number> = {};
+  const maxValue = Math.max(...arr);
+  const maxBucketStart = Math.floor(maxValue / bucketSize) * bucketSize;
+
+  for (const item of arr) {
+    const bucketStart = Math.floor(Math.round(item) / bucketSize) * bucketSize;
+    buckets[bucketStart] = (buckets[bucketStart] ?? 0) + 1;
+  }
+
+  const result: { x: string; y: number }[] = [];
+
+  for (let start = 0; start <= maxBucketStart; start += bucketSize) {
+    const end = start + bucketSize - 1;
+    const label = `${start}-${end}`;
+
+    result.push({
+      x: label,
+      y: buckets[start] ?? 0,
+    });
+  }
+
+  return result;
+}
diff --git a/frontend/src/ts/components/pages/account/HistoryChart.tsx b/frontend/src/ts/components/pages/account/HistoryChart.tsx
new file mode 100644
index 000000000000..d79c4f591d7a
--- /dev/null
+++ b/frontend/src/ts/components/pages/account/HistoryChart.tsx
@@ -0,0 +1,406 @@
+import { AccountChart } from "@monkeytype/schemas/configs";
+import { Mode } from "@monkeytype/schemas/shared";
+import { format as dateFormat } from "date-fns/format";
+import { createMemo, JSXElement, Show } from "solid-js";
+
+import { setConfig } from "../../../config/setters";
+import { getConfig } from "../../../config/store";
+import { SnapshotResult } from "../../../constants/default-snapshot";
+import { getTheme } from "../../../states/theme";
+import { blendTwoHexColors } from "../../../utils/colors";
+import { Formatting } from "../../../utils/format";
+import { findLineByLeastSquares } from "../../../utils/numbers";
+import { TypingSpeedUnitSettings } from "../../../utils/typing-speed-units";
+import { Button } from "../../common/Button";
+import { ChartJs } from "../../common/ChartJs";
+
+export type HistoryChartClickEvent = {
+  index: number;
+  _id: string;
+};
+export function HistoryChart(props: {
+  results: SnapshotResult<Mode>[];
+  beginAtZero: boolean;
+  typingSpeedUnit: TypingSpeedUnitSettings;
+  format: Formatting;
+  onClick?: (event: HistoryChartClickEvent) => void;
+}): JSXElement {
+  const formatAccuracy = (accuracy: number): string =>
+    props.format.accuracy(accuracy, { showDecimalPlaces: true });
+  const formatSpeed = (wpm: number): string =>
+    props.format.typingSpeed(wpm, { showDecimalPlaces: true });
+  const wpm = createMemo(() =>
+    props.results.map((it) => props.typingSpeedUnit.fromWpm(it.wpm)),
+  );
+  const acc = createMemo(() => props.results.map((it) => it.acc));
+
+  const toggleAccountChart = (pos: number): (() => void) => {
+    return () => {
+      const newValue = [...getConfig.accountChart] as AccountChart;
+      newValue[pos] = newValue[pos] === "on" ? "off" : "on";
+      setConfig("accountChart", newValue);
+    };
+  };
+
+  const colorIndex = (...val: boolean[]): number =>
+    val.filter((it) => it).length;
+
+  const datasetOptions = createMemo(() => {
+    const wpmColors = [
+      getTheme().main,
+      blendTwoHexColors(getTheme().bg, getTheme().main, 0.4),
+      blendTwoHexColors(getTheme().bg, getTheme().main, 0.2),
+    ];
+    const accColors = [
+      getTheme().sub,
+      blendTwoHexColors(getTheme().bg, getTheme().sub, 0.4),
+      blendTwoHexColors(getTheme().bg, getTheme().sub, 0.2),
+    ];
+
+    const isSpeed = getConfig.accountChart[0] === "on";
+    const isAcc = getConfig.accountChart[1] === "on";
+    const isAvg10 = getConfig.accountChart[2] === "on";
+    const isAvg100 = getConfig.accountChart[3] === "on";
+
+    return {
+      wpm: {
+        yAxisID: "wpm",
+        fill: false,
+        borderWidth: 0,
+        hidden: !isSpeed,
+        pointBackgroundColor: wpmColors[colorIndex(isAvg10, isAvg100)],
+        order: 3,
+      },
+      wpmAvg10: {
+        yAxisID: "wpm",
+        fill: false,
+        pointRadius: 0,
+        pointHoverRadius: 0,
+        hidden: !isSpeed || !isAvg10,
+        borderColor: wpmColors[colorIndex(isAvg10, isAvg100) - 1],
+        order: 2,
+      },
+      wpmAvg100: {
+        yAxisID: "wpm",
+        fill: false,
+        pointRadius: 0,
+        pointHoverRadius: 0,
+        hidden: !isSpeed || !isAvg100,
+        borderColor: wpmColors[0],
+        order: 1,
+      },
+      acc: {
+        yAxisID: "acc",
+        fill: false,
+        pointStyle: "triangle",
+        borderWidth: 0,
+        pointRadius: 3.5,
+        hidden: !isAcc,
+        pointBackgroundColor: accColors[colorIndex(isAvg10, isAvg100)],
+        order: 3,
+      },
+      accAvg10: {
+        yAxisID: "acc",
+        fill: false,
+        pointRadius: 0,
+        pointHoverRadius: 0,
+        hidden: !isAcc || !isAvg10,
+        borderColor: accColors[colorIndex(isAvg10, isAvg100) - 1],
+        order: 2,
+      },
+      accAvg100: {
+        yAxisID: "acc",
+        fill: false,
+        pointRadius: 0,
+        pointHoverRadius: 0,
+        hidden: !isAcc || !isAvg100,
+        borderColor: accColors[0],
+        order: 1,
+      },
+      pb: {
+        yAxisID: "wpm",
+        fill: false,
+        stepped: true,
+        pointRadius: 0,
+        pointHoverRadius: 0,
+        order: 4,
+        hidden: !isSpeed,
+        borderColor: blendTwoHexColors(getTheme().bg, getTheme().text, 0.2),
+      },
+    };
+  });
+
+  return (
+    <>
+      <div style={{ height: "400px" }}>
+        <ChartJs
+          name="History"
+          type="line"
+          data={{
+            labels: props.results.map((_, i) => i),
+            datasets: [
+              {
+                data: wpm(),
+                ...datasetOptions().wpm,
+              },
+              {
+                data: pb(wpm()),
+                ...datasetOptions().pb,
+              },
+              {
+                data: acc(),
+                ...datasetOptions().acc,
+              },
+              {
+                data: movingAverage(wpm(), 10),
+                ...datasetOptions().wpmAvg10,
+              },
+              {
+                data: movingAverage(acc(), 10),
+                ...datasetOptions().accAvg10,
+              },
+              {
+                data: movingAverage(wpm(), 100),
+                ...datasetOptions().wpmAvg100,
+              },
+              {
+                data: movingAverage(acc(), 100),
+                ...datasetOptions().accAvg100,
+              },
+            ],
+          }}
+          options={{
+            // responsive: true,
+            maintainAspectRatio: false,
+            hover: {
+              mode: "nearest",
+              intersect: false,
+            },
+            onClick: (_, elements) => {
+              const nearest = elements.find((it) => it.datasetIndex === 0);
+              if (nearest === undefined) return;
+              props.onClick?.({
+                index: nearest.index,
+                _id: props.results[nearest.index]?._id as string,
+              });
+            },
+            scales: {
+              x: {
+                axis: "x",
+                type: "linear",
+                reverse: true,
+                min: -1,
+                max: wpm().length,
+                display: false,
+                grid: {
+                  display: false,
+                },
+              },
+              wpm: {
+                axis: "y",
+                type: "linear",
+                beginAtZero: props.beginAtZero,
+                ticks: {
+                  stepSize: props.typingSpeedUnit.historyStepSize,
+                },
+                display: true,
+                title: {
+                  display: true,
+                  text: props.typingSpeedUnit.fullUnitString,
+                },
+                position: "right",
+              },
+              acc: {
+                axis: "y",
+                beginAtZero: props.beginAtZero,
+                min:
+                  getConfig.accountChart[0] === "on" || acc().length === 0
+                    ? 0
+                    : Math.floor(Math.min(...acc()) / 5) * 5,
+                max: 100,
+                reverse: true,
+                ticks: {
+                  stepSize: 10,
+                },
+                display: true,
+                title: {
+                  display: true,
+                  text: "Accuracy",
+                },
+                grid: {
+                  display: false,
+                },
+                position: "left",
+              },
+            },
+
+            plugins: {
+              annotation: {
+                annotations: [],
+              },
+              tooltip: {
+                animation: { duration: 250 },
+                // Disable the on-canvas tooltip
+                enabled: true,
+
+                intersect: false,
+                external: function (ctx): void {
+                  if (ctx === undefined) return;
+                  ctx.tooltip.options.displayColors = false;
+                },
+                filter: function (tooltipItem): boolean {
+                  return (
+                    tooltipItem.datasetIndex !== 1 &&
+                    tooltipItem.datasetIndex !== 3 &&
+                    tooltipItem.datasetIndex !== 4 &&
+                    tooltipItem.datasetIndex !== 5 &&
+                    tooltipItem.datasetIndex !== 6
+                  );
+                },
+                callbacks: {
+                  title: function (): string {
+                    return "";
+                  },
+
+                  beforeLabel: function (tooltipItem): string {
+                    const result = props.results[tooltipItem.dataIndex];
+                    if (result === undefined) return "unknown";
+
+                    if (tooltipItem.datasetIndex !== 0) {
+                      return `error rate: ${formatAccuracy(100 - result.acc)}\nacc: ${formatAccuracy(result.acc)}`;
+                    }
+
+                    let label =
+                      `${getConfig.typingSpeedUnit}: ${formatSpeed(result.wpm)}` +
+                      "\n" +
+                      `raw: ${formatSpeed(result.rawWpm)}` +
+                      "\n" +
+                      `acc: ${formatAccuracy(result.acc)}` +
+                      "\n\n" +
+                      `mode: ${result.mode} `;
+
+                    if (result.mode === "time") {
+                      label += result.mode2;
+                    } else if (result.mode === "words") {
+                      label += result.mode2;
+                    }
+
+                    let diff = result.difficulty ?? "normal";
+                    label += `\ndifficulty: ${diff}`;
+
+                    label +=
+                      "\n" +
+                      `punctuation: ${result.punctuation}` +
+                      "\n" +
+                      `language: ${result.language}` +
+                      `${result.isPb ? "\n\nnew personal best" : ""}` +
+                      "\n\n" +
+                      `date: ${dateFormat(
+                        new Date(result.timestamp),
+                        "dd MMM yyyy HH:mm",
+                      )}`;
+
+                    return label;
+                  },
+
+                  label: function (): string {
+                    return "";
+                  },
+                  afterLabel: function (_tooltip): string {
+                    //accountHistoryActiveIndex = tooltip.dataIndex;
+                    return "";
+                  },
+                },
+              },
+            },
+          }}
+        />
+      </div>
+      <div class="grid grid-cols-1 items-center lg:grid-cols-[1fr_30rem]">
+        <Trend results={props.results} />
+        <div class="grid grid-cols-4 gap-2 text-em-xs">
+          <Button
+            fa={{ icon: "fa-tachometer-alt", fixedWidth: true }}
+            text="Speed"
+            onClick={toggleAccountChart(0)}
+            active={getConfig.accountChart[0] === "on"}
+          />
+          <Button
+            fa={{ icon: "fa-bullseye", fixedWidth: true }}
+            text="Accuracy"
+            onClick={toggleAccountChart(1)}
+            active={getConfig.accountChart[1] === "on"}
+          />
+          <Button
+            fa={{ icon: "fa-chart-line", fixedWidth: true }}
+            text="Avg of 10"
+            onClick={toggleAccountChart(2)}
+            active={getConfig.accountChart[2] === "on"}
+          />
+          <Button
+            fa={{ icon: "fa-chart-line", fixedWidth: true }}
+            text="Avg of 100"
+            onClick={toggleAccountChart(3)}
+            active={getConfig.accountChart[3] === "on"}
+          />
+        </div>
+      </div>
+    </>
+  );
+}
+
+function Trend(props: { results: SnapshotResult<Mode>[] }): JSXElement {
+  const format = createMemo(() => new Formatting(getConfig));
+
+  const trend = createMemo(() => {
+    const line = findLineByLeastSquares(
+      props.results.map((it) => it.wpm).reverse(),
+    );
+    if (line === null) return undefined;
+
+    const totalSecondsFiltered = props.results
+      .map((it) => it.timeTyping)
+      .reduce((acc, it) => acc + it, 0);
+
+    const wpmChange = line[1][1] - line[0][1];
+    const wpmChangePerHour = wpmChange * (3600 / totalSecondsFiltered);
+    const plus = wpmChangePerHour > 0 ? "+" : "";
+
+    return `Speed change per hour spent typing: ${plus}${format().typingSpeed(wpmChangePerHour, { showDecimalPlaces: true })} ${format().typingSpeedUnit}`;
+  });
+
+  return (
+    <Show when={trend() !== undefined}>
+      <div class="w-full p-4 text-center text-sub">{trend()}</div>
+    </Show>
+  );
+}
+
+function movingAverage(data: number[], windowSize: number): number[] {
+  return data.map((_, i, array) => {
+    const subset = array.slice(i, i + windowSize);
+
+    if (subset.length === 0) return 0;
+
+    const sum = subset.reduce((acc, value) => acc + value, 0);
+
+    return sum / subset.length;
+  });
+}
+
+function pb(data: number[]): number[] {
+  const result = new Array<number>(data.length);
+  let currentMax: number = -Infinity;
+
+  for (let i = data.length - 1; i >= 0; i--) {
+    const value = Number(data[i]);
+
+    if (Number.isFinite(value)) {
+      currentMax = Math.max(currentMax, value);
+    }
+
+    result[i] = currentMax;
+  }
+
+  return result;
+}
diff --git a/frontend/src/ts/components/pages/account/MiniResultChart.tsx b/frontend/src/ts/components/pages/account/MiniResultChart.tsx
new file mode 100644
index 000000000000..831cd82a1e18
--- /dev/null
+++ b/frontend/src/ts/components/pages/account/MiniResultChart.tsx
@@ -0,0 +1,155 @@
+import { ChartData } from "@monkeytype/schemas/results";
+import { useQuery } from "@tanstack/solid-query";
+import { createMemo, JSXElement } from "solid-js";
+
+import { getSingleResultQueryOptions } from "../../../collections/results";
+import { getConfig } from "../../../config/store";
+import { isModalOpen } from "../../../states/modals";
+import { getTheme } from "../../../states/theme";
+import { get as getTypingSpeedUnit } from "../../../utils/typing-speed-units";
+import { AnimatedModal } from "../../common/AnimatedModal";
+import AsyncContent from "../../common/AsyncContent";
+import { ChartJs } from "../../common/ChartJs";
+
+export function MiniResultChart(props: { resultId: string }): JSXElement {
+  const query = useQuery(() => ({
+    ...getSingleResultQueryOptions(props.resultId),
+    enabled: isModalOpen("MiniResultChartModal"),
+  }));
+
+  const beginAtZero = createMemo(() => getConfig.startGraphsAtZero);
+  const typingSpeedUnit = createMemo(() =>
+    getTypingSpeedUnit(getConfig.typingSpeedUnit),
+  );
+
+  return (
+    <AnimatedModal id="MiniResultChartModal" modalClass="max-w-300">
+      <AsyncContent queries={{ query }}>
+        {({ queryData }) => {
+          const data = queryData().chartData as ChartData;
+
+          return (
+            <div class="h-60 w-full">
+              <ChartJs
+                name="MiniResult"
+                type="line"
+                data={{
+                  labels: data.wpm.map((_, index) => (index + 1).toString()),
+                  datasets: [
+                    {
+                      label: "wpm",
+                      data: data.wpm.map((it) => typingSpeedUnit().fromWpm(it)),
+                      borderWidth: 3,
+                      yAxisID: "wpm",
+                      order: 2,
+                      pointRadius: 1,
+                      fill: false,
+                      borderColor: getTheme().main,
+                      backgroundColor: getTheme().main,
+                    },
+                    {
+                      label: "burst",
+                      data: data.burst.map((it) =>
+                        typingSpeedUnit().fromWpm(it),
+                      ),
+                      borderWidth: 3,
+                      yAxisID: "wpm",
+                      order: 3,
+                      pointRadius: 1,
+                      fill: false,
+                      borderColor: getTheme().sub,
+                      backgroundColor: getTheme().sub,
+                    },
+                    {
+                      label: "errors",
+                      data: data.err,
+                      pointBorderColor: getTheme().error,
+                      backgroundColor: getTheme().error,
+                      borderWidth: 2,
+                      order: 1,
+                      yAxisID: "error",
+                      type: "scatter",
+                      pointStyle: "crossRot",
+                      pointRadius: function (context): number {
+                        const index = context.dataIndex;
+                        const value = context.dataset.data[index] as number;
+                        return (value ?? 0) <= 0 ? 0 : 3;
+                      },
+                      pointHoverRadius: function (context): number {
+                        const index = context.dataIndex;
+                        const value = context.dataset.data[index] as number;
+                        return (value ?? 0) <= 0 ? 0 : 5;
+                      },
+                    },
+                  ],
+                }}
+                options={{
+                  responsive: true,
+                  maintainAspectRatio: false,
+                  scales: {
+                    x: {
+                      axis: "x",
+                      ticks: {
+                        autoSkip: true,
+                        autoSkipPadding: 20,
+                      },
+                      display: true,
+                      title: {
+                        display: false,
+                        text: "Seconds",
+                      },
+                    },
+                    wpm: {
+                      axis: "y",
+                      display: true,
+                      title: {
+                        display: true,
+                        text: typingSpeedUnit().fullUnitString,
+                      },
+                      beginAtZero: beginAtZero(),
+                      ticks: {
+                        autoSkip: true,
+                        autoSkipPadding: 20,
+                      },
+                      grid: {
+                        display: true,
+                      },
+                    },
+
+                    error: {
+                      display: true,
+                      position: "right",
+                      title: {
+                        display: true,
+                        text: "Errors",
+                      },
+                      beginAtZero: beginAtZero(),
+                      ticks: {
+                        precision: 0,
+                        autoSkip: true,
+                        autoSkipPadding: 20,
+                      },
+                      grid: {
+                        display: false,
+                      },
+                    },
+                  },
+                  plugins: {
+                    annotation: {
+                      annotations: [],
+                    },
+                    tooltip: {
+                      animation: { duration: 250 },
+                      mode: "index",
+                      intersect: false,
+                    },
+                  },
+                }}
+              />
+            </div>
+          );
+        }}
+      </AsyncContent>
+    </AnimatedModal>
+  );
+}
diff --git a/frontend/src/ts/components/pages/account/Table.tsx b/frontend/src/ts/components/pages/account/Table.tsx
new file mode 100644
index 000000000000..c8beaa588a64
--- /dev/null
+++ b/frontend/src/ts/components/pages/account/Table.tsx
@@ -0,0 +1,302 @@
+import { Difficulty } from "@monkeytype/schemas/configs";
+import { Mode } from "@monkeytype/schemas/shared";
+import { createColumnHelper } from "@tanstack/solid-table";
+import { format as dateFormat } from "date-fns/format";
+import { Accessor, createMemo, createSignal, JSXElement, Show } from "solid-js";
+
+import { type TagItem, useTagsLiveQuery } from "../../../collections/tags";
+import { getConfig } from "../../../config/store";
+import { SnapshotResult } from "../../../constants/default-snapshot";
+import * as EditResultTagsModal from "../../../modals/edit-result-tags";
+import { showModal } from "../../../states/modals";
+import { showNoticeNotification } from "../../../states/notifications";
+import { cn } from "../../../utils/cn";
+import { Formatting } from "../../../utils/format";
+import { replaceUnderscoresWithSpaces } from "../../../utils/strings";
+import { Button } from "../../common/Button";
+import { Fa, FaProps } from "../../common/Fa";
+import { DataTable, DataTableColumnDef } from "../../ui/table/DataTable";
+import { MiniResultChart } from "./MiniResultChart";
+
+type Sorting = {
+  field: keyof SnapshotResult<Mode>;
+  direction: "asc" | "desc";
+};
+
+export function Table<M extends Mode>(props: {
+  data: SnapshotResult<M>[];
+  onSortingChange: (sorting: Sorting) => void;
+  selectedRowId: Accessor<string | null>;
+}): JSXElement {
+  const [selectedResult, setSelectedResult] = createSignal<string | undefined>(
+    undefined,
+  );
+
+  const tags = useTagsLiveQuery();
+
+  const columns = createMemo(() =>
+    getColumns<M>({
+      format: new Formatting(getConfig),
+      tags: tags(),
+      onMiniResultChartSelected: (id) => {
+        setSelectedResult(id);
+        if (id !== undefined) showModal("MiniResultChartModal");
+      },
+    }),
+  );
+
+  return (
+    <>
+      <Show when={selectedResult() !== undefined}>
+        <MiniResultChart resultId={selectedResult() as string} />
+      </Show>
+      <DataTable
+        id="resultList"
+        onSortingChange={(val) => {
+          if (val.length === 0) {
+            props.onSortingChange({ field: "timestamp", direction: "desc" });
+          } else {
+            props.onSortingChange({
+              field: val[0]?.id as keyof SnapshotResult<Mode>,
+              direction: val[0]?.desc ? "desc" : "asc",
+            });
+          }
+        }}
+        class={cn("table-auto", "text-xs md:text-sm lg:text-base")}
+        // headerCellClass="p-1"
+        // bodyCellClass="p-1"
+        data={props.data}
+        columns={columns()}
+        fallback=<span>No data found. Check your filters.</span>
+        rowSelection={{
+          getRowId: (row) => row._id,
+          activeRow: props.selectedRowId,
+          class: cn(
+            "text-main [&>td>div]:text-main [&>td>div>a]:text-main",
+            "**:data-[ui-element='button']:[--themable-button-text:var(--text-main)]",
+          ),
+        }}
+      />
+    </>
+  );
+}
+
+function getColumns<M extends Mode>({
+  format,
+  tags,
+  onMiniResultChartSelected,
+}: {
+  format: Formatting;
+  tags: TagItem[];
+  onMiniResultChartSelected(val: string): void;
+}): DataTableColumnDef<SnapshotResult<M>>[] {
+  const defineColumn = createColumnHelper<SnapshotResult<M>>().accessor;
+  const columns = [
+    defineColumn("isPb", {
+      header: "",
+      cell: (info) =>
+        info.getValue() ? (
+          <Fa icon="fa-crown" />
+        ) : (
+          <Fa icon="fa-crown" class="opacity-0" />
+        ),
+      enableSorting: false,
+      meta: {
+        cellMeta: {
+          class: cn("w-0", "xl:pr-6 xl:pl-8", "pl-4"),
+        },
+      },
+    }),
+    defineColumn("wpm", {
+      header: format.typingSpeedUnit,
+      cell: (info) =>
+        format.typingSpeed(info.getValue(), { showDecimalPlaces: true }),
+    }),
+    defineColumn("rawWpm", {
+      header: "raw",
+      cell: (info) =>
+        format.typingSpeed(info.getValue(), { showDecimalPlaces: true }),
+      meta: {
+        breakpoint: "xs",
+      },
+    }),
+    defineColumn("acc", {
+      header: "accuracy",
+      cell: (info) =>
+        format.percentage(info.getValue(), { showDecimalPlaces: true }),
+      meta: {
+        breakpoint: "xs",
+      },
+    }),
+    defineColumn("consistency", {
+      header: "consistency",
+      cell: (info) =>
+        format.percentage(info.getValue(), { showDecimalPlaces: true }),
+      meta: {
+        breakpoint: "xs",
+      },
+    }),
+    defineColumn("charStats", {
+      header: "chars",
+      cell: (info) =>
+        `${info.row.original.charStats[0]}/${info.row.original.charStats[1]}/${info.row.original.charStats[2]}/${info.row.original.charStats[3]}`,
+      meta: {
+        breakpoint: "lg",
+      },
+    }),
+    defineColumn("mode", {
+      header: "mode",
+      enableSorting: false,
+      cell: (info) =>
+        `${info.getValue()} ${info.row.original.mode2 === "custom" ? "" : info.row.original.mode2}`,
+      meta: {
+        breakpoint: "md",
+      },
+    }),
+    defineColumn("_id", {
+      header: "info",
+      enableSorting: false,
+      cell: (info) => {
+        const hasChart =
+          info.row.original.chartData !== "toolong" &&
+          info.row.original.testDuration <= 122;
+
+        return (
+          <div class="flex gap-0.5">
+            <span aria-label={info.row.original.language} data-balloon-pos="up">
+              <Fa icon="fa-globe-americas" fixedWidth={true} />
+            </span>
+            <span
+              aria-label={info.row.original.difficulty}
+              data-balloon-pos="up"
+            >
+              <Fa {...difficultyIcon(info.row.original.difficulty)} />
+            </span>
+            <Show when={info.row.original.punctuation}>
+              <span aria-label="punctuation" data-balloon-pos="up">
+                <Fa icon="fa-at" fixedWidth={true} />
+              </span>
+            </Show>
+            <Show when={info.row.original.numbers}>
+              <span aria-label="numbers" data-balloon-pos="up">
+                <Fa icon="fa-hashtag" fixedWidth={true} />
+              </span>
+            </Show>
+            <Show when={info.row.original.blindMode}>
+              <span aria-label="blind mode" data-balloon-pos="up">
+                <Fa icon="fa-eye-slash" fixedWidth={true} />
+              </span>
+            </Show>
+            <Show when={info.row.original.lazyMode}>
+              <span aria-label="lazy mode" data-balloon-pos="up">
+                <Fa icon="fa-couch" fixedWidth={true} />
+              </span>
+            </Show>
+            <Show when={(info.row.original.funbox ?? []).length > 0}>
+              <span
+                aria-label={info.row.original.funbox
+                  .map(replaceUnderscoresWithSpaces)
+                  .join(", ")}
+                data-balloon-pos="up"
+              >
+                <Fa icon="fa-gamepad" fixedWidth={true} />
+              </span>
+            </Show>
+            <span
+              data-balloon-pos="up"
+              aria-label={
+                hasChart
+                  ? "View graph"
+                  : "Graph history is not available for long tests"
+              }
+            >
+              <Button
+                disabled={!hasChart}
+                class="p-0 text-inherit"
+                variant="text"
+                fa={{ icon: "fa-chart-line", fixedWidth: true }}
+                onClick={() => {
+                  onMiniResultChartSelected(info.getValue());
+                }}
+              />
+            </span>
+          </div>
+        );
+      },
+      meta: {
+        breakpoint: "sm",
+      },
+    }),
+    defineColumn("tags", {
+      header: "tags",
+      enableSorting: false,
+      cell: (info) => {
+        const hasTags = () => info.getValue().length > 0;
+        return (
+          <Button
+            variant="text"
+            class={
+              hasTags() ? "[--themable-button-text:var(--text-color)]" : ""
+            }
+            fa={{
+              icon: info.getValue().length > 1 ? "fa-tags" : "fa-tag",
+              fixedWidth: true,
+            }}
+            balloon={{
+              text: hasTags()
+                ? info
+                    .getValue()
+                    .map(
+                      (it) =>
+                        tags.find((tag) => tag._id === it)?.name ??
+                        "unknown tag",
+                    )
+                    .join(", ")
+                : "no tags",
+            }}
+            onClick={() => {
+              if (tags.length === 0) {
+                showNoticeNotification(
+                  "You have no tags. You can create one in the tags section of the settings page.",
+                );
+                return;
+              }
+              EditResultTagsModal.show(
+                info.row.original._id,
+                info.getValue(),
+                "accountPage",
+              );
+            }}
+          />
+        );
+      },
+      meta: {
+        breakpoint: "sm",
+      },
+    }),
+    defineColumn("timestamp", {
+      header: "date",
+      cell: (info) => (
+        <>
+          <div class="text-em-sm">
+            {dateFormat(info.getValue(), "dd MMM yyyy")}
+          </div>
+          <div class="text-em-sm text-sub">
+            {dateFormat(info.getValue(), "HH:mm")}
+          </div>
+        </>
+      ),
+    }),
+  ];
+  return columns;
+}
+
+function difficultyIcon(difficulty: Difficulty): FaProps {
+  if (difficulty === "expert") {
+    return { variant: "solid", icon: "fa-star-half-alt", fixedWidth: true };
+  } else if (difficulty === "master") {
+    return { variant: "solid", icon: "fa-star", fixedWidth: true };
+  } else {
+    return { variant: "regular", icon: "fa-star", fixedWidth: true };
+  }
+}
diff --git a/frontend/src/ts/components/pages/account/TestStats.tsx b/frontend/src/ts/components/pages/account/TestStats.tsx
new file mode 100644
index 000000000000..36c57093d958
--- /dev/null
+++ b/frontend/src/ts/components/pages/account/TestStats.tsx
@@ -0,0 +1,185 @@
+import { Accessor, createMemo, JSXElement, Show } from "solid-js";
+
+import {
+  ResultsQueryState,
+  ResultStats,
+  useResultStatsLiveQuery,
+} from "../../../collections/results";
+import { getConfig } from "../../../config/store";
+import { secondsToString } from "../../../utils/date-and-time";
+import { Formatting } from "../../../utils/format";
+import AsyncContent from "../../common/AsyncContent";
+import { Fa } from "../../common/Fa";
+
+export function TestStats(props: {
+  queryState: Accessor<ResultsQueryState | undefined>;
+}): JSXElement {
+  const format = createMemo(() => new Formatting(getConfig));
+  const formatWpm = (val: number): string => format().typingSpeed(val);
+  const formatPercentage = (val: number): string => format().percentage(val);
+
+  const statsQuery = useResultStatsLiveQuery(() => props.queryState());
+  const last10StatsQuery = useResultStatsLiveQuery(() => props.queryState(), {
+    lastTen: true,
+  });
+
+  const stats = () => statsQuery()[0];
+  const last10 = () => last10StatsQuery()[0];
+
+  return (
+    <AsyncContent collections={{ statsQuery, last10StatsQuery }}>
+      {() => (
+        <Show
+          when={
+            stats() !== undefined &&
+            last10() !== undefined &&
+            ([stats() as ResultStats, last10() as ResultStats] as const)
+          }
+        >
+          {(data) => {
+            const [stats, last10] = data();
+
+            return (
+              <>
+                <div class="flex items-center justify-center text-sub">
+                  estimated words typed{" "}
+                  <span class="p-5 text-5xl text-text lg:text-5xl">
+                    {stats.words}
+                  </span>
+                </div>
+                <div class="grid grid-cols-3 gap-4">
+                  <Stat
+                    header="tests started"
+                    value={stats.restarted + stats.completed}
+                  />
+                  <div>
+                    <div class="text-sub">
+                      tests completed{" "}
+                      <span
+                        data-balloon-length="xlarge"
+                        data-balloon-pos="up"
+                        aria-label="Due to the increasing number of results in the database, you can now only see your last 1000 results in detail. Total time spent typing, started and completed tests stats will still be up to date at the top of the page, above the filters."
+                        role="alertdialog"
+                      >
+                        <Fa icon="fa-question-circle" />
+                      </span>
+                    </div>
+                    <div class="text-2xl leading-[1.1] md:text-3xl lg:text-5xl">
+                      {stats.completed}(
+                      {stats.completed + stats.restarted > 0
+                        ? Math.floor(
+                            (stats.completed /
+                              (stats.completed + stats.restarted)) *
+                              100,
+                          )
+                        : 0}
+                      %)
+                    </div>
+                    <div class="text-xs">
+                      {stats.completed > 0
+                        ? (stats.restarted / stats.completed).toFixed(1)
+                        : "0.0"}{" "}
+                      restarts per completed test
+                    </div>
+                  </div>
+
+                  <Stat
+                    header="time typing"
+                    value={stats.timeTyping}
+                    formatter={(val) =>
+                      secondsToString(Math.round(val), true, true)
+                    }
+                  />
+
+                  <Stat
+                    header={`highest ${format().typingSpeedUnit}`}
+                    value={stats.maxWpm}
+                    formatter={formatWpm}
+                  />
+                  <Stat
+                    header={`average ${format().typingSpeedUnit}`}
+                    value={stats.avgWpm}
+                    formatter={formatWpm}
+                  />
+                  <Stat
+                    header={`average ${format().typingSpeedUnit} (last 10 tests)`}
+                    value={last10.avgWpm}
+                    formatter={formatWpm}
+                  />
+
+                  <Stat
+                    header={`highest raw ${format().typingSpeedUnit}`}
+                    value={stats.maxRaw}
+                    formatter={formatWpm}
+                  />
+                  <Stat
+                    header={`average raw ${format().typingSpeedUnit}`}
+                    value={stats.avgRaw}
+                    formatter={formatWpm}
+                  />
+                  <Stat
+                    header={`average raw ${format().typingSpeedUnit} (last 10 tests)`}
+                    value={last10.avgRaw}
+                    formatter={formatWpm}
+                  />
+
+                  <Stat
+                    header={`highest acc`}
+                    value={stats.maxAcc}
+                    formatter={formatPercentage}
+                  />
+                  <Stat
+                    header={`average acc`}
+                    value={stats.avgAcc}
+                    formatter={formatPercentage}
+                  />
+                  <Stat
+                    header={`average acc (last 10 tests)`}
+                    value={last10.avgAcc}
+                    formatter={formatPercentage}
+                  />
+
+                  <Stat
+                    header={`highest consistency`}
+                    value={stats.maxConsistency}
+                    formatter={formatPercentage}
+                  />
+                  <Stat
+                    header={`average consistency`}
+                    value={stats.avgConsistency}
+                    formatter={formatPercentage}
+                  />
+                  <Stat
+                    header={`average consistency (last 10 tests)`}
+                    value={last10.avgConsistency}
+                    formatter={formatPercentage}
+                  />
+                </div>
+              </>
+            );
+          }}
+        </Show>
+      )}
+    </AsyncContent>
+  );
+}
+
+function Stat(options: {
+  header: string;
+  value: number | undefined;
+  formatter?: (value: number) => string;
+}): JSXElement {
+  return (
+    <div>
+      <div class="text-sub">{options.header}</div>
+
+      <div class="text-2xl leading-[1.1] md:text-3xl lg:text-5xl">
+        <Show when={options.value !== undefined}>
+          {options.formatter !== undefined
+            ? options.formatter(options.value ?? -1)
+            : options.value}
+        </Show>
+      </div>
+    </div>
+  );
+}
diff --git a/frontend/src/ts/components/pages/account/VerifyNotice.tsx b/frontend/src/ts/components/pages/account/VerifyNotice.tsx
new file mode 100644
index 000000000000..c60d966d9da3
--- /dev/null
+++ b/frontend/src/ts/components/pages/account/VerifyNotice.tsx
@@ -0,0 +1,36 @@
+import { createSignal, JSXElement, Show } from "solid-js";
+
+import { sendVerificationEmail } from "../../../auth";
+import { isUserVerified } from "../../../states/core";
+import { cn } from "../../../utils/cn";
+import { Button } from "../../common/Button";
+import { Fa } from "../../common/Fa";
+
+export function VerifyNotice(props: { class?: string }): JSXElement {
+  const [isProcessing, setProcessing] = createSignal(false);
+
+  const resendVerificationEmail = () => {
+    setProcessing(true);
+    void sendVerificationEmail().finally(() => setProcessing(false));
+  };
+  return (
+    <Show when={!isUserVerified()}>
+      <div
+        class={cn(
+          `grid items-center gap-4 rounded p-4 ring-4 ring-sub-alt md:grid-cols-[1fr_auto] ${props.class ?? ""}`,
+        )}
+      >
+        <div class="grid grid-cols-[auto_1fr] items-center gap-4">
+          <Fa icon="fa-exclamation-triangle" class="text-4xl text-sub" />
+          <div>Your email address is still not verified</div>
+        </div>
+        <Button
+          class="px-4"
+          text="resend verification email"
+          disabled={isProcessing()}
+          onClick={resendVerificationEmail}
+        />
+      </div>
+    </Show>
+  );
+}
diff --git a/frontend/src/ts/components/pages/account/utils.ts b/frontend/src/ts/components/pages/account/utils.ts
new file mode 100644
index 000000000000..096bfe99631f
--- /dev/null
+++ b/frontend/src/ts/components/pages/account/utils.ts
@@ -0,0 +1,42 @@
+import { ResultFilters, ResultFiltersSchema } from "@monkeytype/schemas/users";
+import { typedKeys } from "../../../utils/misc";
+import defaultResultFilters from "../../../constants/default-result-filters";
+import { sanitize } from "../../../utils/sanitize";
+
+export function mergeWithDefaultFilters(
+  filters: Partial<ResultFilters>,
+): ResultFilters {
+  try {
+    const merged = {} as ResultFilters;
+    for (const groupKey of typedKeys(defaultResultFilters)) {
+      if (groupKey === "_id") {
+        let id = filters[groupKey] ?? defaultResultFilters[groupKey];
+        if (id === "default-result-filters-id" || id === "") {
+          id = "default";
+        }
+        merged[groupKey] = id;
+      } else if (groupKey === "name") {
+        merged[groupKey] = filters[groupKey] ?? defaultResultFilters[groupKey];
+      } else {
+        // @ts-expect-error i cant figure this out
+        merged[groupKey] = {
+          ...defaultResultFilters[groupKey],
+          ...filters[groupKey],
+        };
+      }
+    }
+    return merged;
+  } catch (e) {
+    return defaultResultFilters;
+  }
+}
+
+export function verifyResultFiltersStructure(
+  filterIn: ResultFilters,
+): ResultFilters {
+  const filter = mergeWithDefaultFilters(
+    sanitize(ResultFiltersSchema.partial().strip(), structuredClone(filterIn)),
+  );
+
+  return filter;
+}
diff --git a/frontend/src/ts/components/ui/table/DataTable.tsx b/frontend/src/ts/components/ui/table/DataTable.tsx
index c24f7b1896d9..06aa1d07a757 100644
--- a/frontend/src/ts/components/ui/table/DataTable.tsx
+++ b/frontend/src/ts/components/ui/table/DataTable.tsx
@@ -59,6 +59,9 @@ export type DataTableProps<TData, TValue> = {
     activeRow: Accessor<string | null>;
   };
   class?: string;
+  headerCellClass?: string;
+  bodyCellClass?: string;
+  onSortingChange?: (sorting: SortingState) => void;
   noDataRow?:
     | true
     | {
@@ -108,8 +111,15 @@ export function DataTable<TData, TValue = any>(
       return props.columns;
     },
     getCoreRowModel: getCoreRowModel(),
-    onSortingChange: setSorting,
-    getSortedRowModel: getSortedRowModel(),
+    onSortingChange: (it) => {
+      setSorting(it);
+      props.onSortingChange?.(sorting());
+    },
+
+    //oxlint-disable-next-line solid/reactivity
+    ...(props.onSortingChange
+      ? { manualSorting: true }
+      : { getSortedRowModel: getSortedRowModel() }),
     enableRowSelection: () => props.rowSelection !== undefined,
     getRowId: (row, index) =>
       props.rowSelection !== undefined
@@ -201,6 +211,7 @@ export function DataTable<TData, TValue = any>(
                                   "right",
                               },
                               columnVisibility()[header.column.id],
+                              props.headerCellClass,
                             )}
                             {...(header.column.columnDef.meta?.headerMeta ??
                               {})}
@@ -223,7 +234,10 @@ export function DataTable<TData, TValue = any>(
                                 ? "descending"
                                 : "none"
                           }
-                          class={cn(columnVisibility()[header.column.id])}
+                          class={cn(
+                            "p-0",
+                            columnVisibility()[header.column.id],
+                          )}
                         >
                           <button
                             type="button"
@@ -244,6 +258,7 @@ export function DataTable<TData, TValue = any>(
                                   header.column.columnDef.meta?.align ===
                                   "right",
                               },
+                              props.headerCellClass,
                               header.column.columnDef.meta?.headerClass,
                             )}
                             {...(header.column.columnDef.meta?.headerMeta ??
@@ -325,6 +340,7 @@ export function DataTable<TData, TValue = any>(
                               cell.column.columnDef.meta?.align === "right",
                           },
                           columnVisibility()[cell.column.id],
+                          props.bodyCellClass,
                           cellClass.class,
                         )}
                       >
diff --git a/frontend/src/ts/components/ui/table/Table.tsx b/frontend/src/ts/components/ui/table/Table.tsx
index 24b5cc0ac96d..fa997f013554 100644
--- a/frontend/src/ts/components/ui/table/Table.tsx
+++ b/frontend/src/ts/components/ui/table/Table.tsx
@@ -17,7 +17,7 @@ const Table: Component<ComponentProps<"table">> = (props) => {
 const TableHeader: Component<ComponentProps<"thead">> = (props) => {
   const [local, others] = splitProps(props, ["class"]);
   return (
-    <thead class={cn("text-xs text-sub", local.class)} {...others}></thead>
+    <thead class={cn("text-em-xs text-sub", local.class)} {...others}></thead>
   );
 };
 
@@ -26,7 +26,7 @@ const TableBody: Component<ComponentProps<"tbody">> = (props) => {
   return (
     <tbody
       class={cn(
-        "text-sm xl:text-base [&>tr:nth-child(odd)>td]:bg-sub-alt",
+        "text-em-base [&>tr:nth-child(odd)>td]:bg-sub-alt",
         local.class,
       )}
       {...others}
@@ -50,7 +50,7 @@ const TableHead: Component<ComponentProps<"th">> = (props) => {
     <th
       aria-label={local["aria-label"]}
       class={cn(
-        "has-button:p-0 appearance-none p-2 align-bottom text-xs font-normal",
+        "appearance-none p-2 align-bottom text-xs font-normal",
         local.class,
       )}
       {...others}
@@ -63,7 +63,7 @@ const TableCell: Component<ComponentProps<"td">> = (props) => {
   return (
     <td
       class={cn(
-        "appearance-none p-0 py-1 first:rounded-l last:rounded-r",
+        "appearance-none p-2 first:rounded-l last:rounded-r",
         local.class,
       )}
       {...others}
diff --git a/frontend/src/ts/constants/default-snapshot.ts b/frontend/src/ts/constants/default-snapshot.ts
index 7a0ecec16eff..7ab69aeaa7ab 100644
--- a/frontend/src/ts/constants/default-snapshot.ts
+++ b/frontend/src/ts/constants/default-snapshot.ts
@@ -1,9 +1,4 @@
-import {
-  ResultFilters,
-  User,
-  UserProfileDetails,
-  UserTag,
-} from "@monkeytype/schemas/users";
+import { User, UserProfileDetails } from "@monkeytype/schemas/users";
 import { getDefaultConfig } from "./default-config";
 import { Mode } from "@monkeytype/schemas/shared";
 import { Result } from "@monkeytype/schemas/results";
@@ -16,14 +11,8 @@ import { Preset } from "@monkeytype/schemas/presets";
 import { Language } from "@monkeytype/schemas/languages";
 import { ConnectionStatus } from "@monkeytype/schemas/connections";
 
-export type SnapshotUserTag = UserTag & {
-  active?: boolean;
-  display: string;
-};
-
 export type SnapshotResult<M extends Mode> = Omit<
   Result<M>,
-  | "_id"
   | "bailedOut"
   | "blindMode"
   | "lazyMode"
@@ -38,7 +27,6 @@ export type SnapshotResult<M extends Mode> = Omit<
   | "afkDuration"
   | "tags"
 > & {
-  _id: string;
   bailedOut: boolean;
   blindMode: boolean;
   lazyMode: boolean;
@@ -52,6 +40,10 @@ export type SnapshotResult<M extends Mode> = Omit<
   incompleteTestSeconds: number;
   afkDuration: number;
   tags: string[];
+  //calculated values
+  words: number;
+  timeTyping: number;
+  dayTimestamp: number;
 };
 
 export type Snapshot = Omit<
@@ -75,12 +67,9 @@ export type Snapshot = Omit<
   inboxUnreadSize: number;
   streak: number;
   maxStreak: number;
-  filterPresets: ResultFilters[];
   isPremium: boolean;
   streakHourOffset?: number;
-  tags: SnapshotUserTag[];
   presets: SnapshotPreset[];
-  results?: SnapshotResult<Mode>[];
   xp: number;
   testActivity?: ModifiableTestActivityCalendar;
   testActivityByYear?: { [key: string]: TestActivityCalendar };
@@ -92,7 +81,6 @@ export type SnapshotPreset = Preset & {
 };
 
 const defaultSnap = {
-  results: undefined,
   personalBests: {
     time: {},
     words: {},
@@ -107,7 +95,6 @@ const defaultSnap = {
   config: getDefaultConfig(),
   customThemes: [],
   presets: [],
-  tags: [],
   banned: undefined,
   verified: undefined,
   lbMemory: { time: { 15: { english: 0 }, 60: { english: 0 } } },
@@ -120,7 +107,6 @@ const defaultSnap = {
   quoteMod: false,
   favoriteQuotes: {},
   addedAt: 0,
-  filterPresets: [],
   xp: 0,
   inboxUnreadSize: 0,
   streak: 0,
diff --git a/frontend/src/ts/controllers/chart-controller.ts b/frontend/src/ts/controllers/chart-controller.ts
index 6fc1a33d6807..16a3b771130a 100644
--- a/frontend/src/ts/controllers/chart-controller.ts
+++ b/frontend/src/ts/controllers/chart-controller.ts
@@ -31,8 +31,6 @@ import chartAnnotation, {
   type LabelOptions,
 } from "chartjs-plugin-annotation";
 import chartTrendline from "chartjs-plugin-trendline";
-import { get as getTypingSpeedUnit } from "../utils/typing-speed-units";
-import { getActivePage } from "../states/core";
 
 Chart.register(
   BarController,
@@ -58,16 +56,12 @@ Chart.defaults.elements.line.tension = 0.5;
 Chart.defaults.elements.line.fill = "origin";
 
 import "chartjs-adapter-date-fns";
-import { format } from "date-fns/format";
 import { Config } from "../config/store";
 import { configEvent } from "../events/config";
 import * as TestInput from "../test/test-input";
-import * as DateTime from "../utils/date-and-time";
 import * as Arrays from "../utils/arrays";
-import * as Numbers from "@monkeytype/util/numbers";
 import { blendTwoHexColors } from "../utils/colors";
 import { typedKeys } from "../utils/misc";
-import { qs } from "../utils/dom";
 import { getTheme } from "../states/theme";
 import { Theme } from "../constants/themes";
 import { createDebouncedEffectOn } from "../hooks/effects";
@@ -306,811 +300,14 @@ export const result = new ChartWithUpdateColors<
   },
 });
 
-export let accountHistoryActiveIndex: number;
-
-export type HistoryChartData = {
-  x: number;
-  y: number;
-  wpm: number;
-  acc: number;
-  mode: string;
-  mode2: string;
-  punctuation: boolean;
-  language: string;
-  timestamp: number;
-  difficulty: string;
-  raw: number;
-  isPb: boolean;
-};
-
-export type AccChartData = {
-  x: number;
-  y: number;
-  errorRate: number;
-};
-
 export type OtherChartData = {
   x: number;
   y: number;
 };
 
-export type ActivityChartDataPoint = {
-  x: number;
-  y: number;
-  maxWpm?: number;
-  restarts?: number;
-  amount?: number;
-  avgWpm?: number;
-  avgAcc?: number;
-  avgCon?: number;
-};
-
-export const accountHistory = new ChartWithUpdateColors<
-  "line",
-  HistoryChartData[] | AccChartData[] | OtherChartData[],
-  string,
-  | "wpm"
-  | "pb"
-  | "acc"
-  | "wpmAvgTen"
-  | "accAvgTen"
-  | "wpmAvgHundred"
-  | "accAvgHundred"
->(
-  document.querySelector(
-    ".pageAccount #accountHistoryChart",
-  ) as HTMLCanvasElement,
-  {
-    type: "line",
-    data: {
-      datasets: [
-        {
-          yAxisID: "wpm",
-          data: [],
-          fill: false,
-          borderWidth: 0,
-          order: 3,
-        },
-        {
-          yAxisID: "pb",
-          data: [],
-          fill: false,
-          stepped: true,
-          pointRadius: 0,
-          pointHoverRadius: 0,
-          order: 4,
-        },
-        {
-          yAxisID: "acc",
-          fill: false,
-          data: [],
-          pointStyle: "triangle",
-          borderWidth: 0,
-          pointRadius: 3.5,
-          order: 3,
-        },
-        {
-          yAxisID: "wpmAvgTen",
-          data: [],
-          fill: false,
-          pointRadius: 0,
-          pointHoverRadius: 0,
-          order: 2,
-        },
-        {
-          yAxisID: "accAvgTen",
-          data: [],
-          fill: false,
-          pointRadius: 0,
-          pointHoverRadius: 0,
-          order: 2,
-        },
-        {
-          yAxisID: "wpmAvgHundred",
-          data: [],
-          fill: false,
-          pointRadius: 0,
-          pointHoverRadius: 0,
-          order: 1,
-        },
-        {
-          yAxisID: "accAvgHundred",
-          label: "accAvgHundred",
-          data: [],
-          fill: false,
-          pointRadius: 0,
-          pointHoverRadius: 0,
-          order: 1,
-        },
-      ],
-    },
-    options: {
-      // responsive: true,
-      maintainAspectRatio: false,
-      hover: {
-        mode: "nearest",
-        intersect: false,
-      },
-      scales: {
-        x: {
-          axis: "x",
-          type: "linear",
-          reverse: true,
-          min: 0,
-          ticks: {
-            stepSize: 10,
-          },
-          display: false,
-          grid: {
-            display: false,
-          },
-        },
-        wpm: {
-          axis: "y",
-          type: "linear",
-          beginAtZero: true,
-          min: 0,
-          ticks: {
-            stepSize: 10,
-          },
-          display: true,
-          title: {
-            display: true,
-            text: "Words per Minute",
-          },
-          position: "right",
-        },
-        pb: {
-          axis: "y",
-          beginAtZero: true,
-          min: 0,
-          ticks: {
-            stepSize: 10,
-          },
-          display: false,
-        },
-        acc: {
-          axis: "y",
-          beginAtZero: true,
-          min: 0,
-          max: 100,
-          reverse: true,
-          ticks: {
-            stepSize: 10,
-          },
-          display: true,
-          title: {
-            display: true,
-            text: "Accuracy",
-          },
-          grid: {
-            display: false,
-          },
-          position: "left",
-        },
-        wpmAvgTen: {
-          axis: "y",
-          beginAtZero: true,
-          min: 0,
-          ticks: {
-            stepSize: 10,
-          },
-          display: false,
-          grid: {
-            display: false,
-          },
-        },
-        accAvgTen: {
-          axis: "y",
-          beginAtZero: true,
-          min: 0,
-          max: 100,
-          reverse: true,
-          ticks: {
-            stepSize: 10,
-          },
-          display: false,
-          grid: {
-            display: false,
-          },
-        },
-        wpmAvgHundred: {
-          axis: "y",
-          beginAtZero: true,
-          min: 0,
-          ticks: {
-            stepSize: 10,
-          },
-          display: false,
-          grid: {
-            display: false,
-          },
-        },
-        accAvgHundred: {
-          axis: "y",
-          beginAtZero: true,
-          min: 0,
-          max: 100,
-          reverse: true,
-          ticks: {
-            stepSize: 10,
-          },
-          display: false,
-          grid: {
-            display: false,
-          },
-        },
-      },
-
-      plugins: {
-        annotation: {
-          annotations: [],
-        },
-        tooltip: {
-          animation: { duration: 250 },
-          // Disable the on-canvas tooltip
-          enabled: true,
-
-          intersect: false,
-          external: function (ctx): void {
-            if (ctx === undefined) return;
-            ctx.tooltip.options.displayColors = false;
-          },
-          filter: function (tooltipItem): boolean {
-            return (
-              tooltipItem.datasetIndex !== 1 &&
-              tooltipItem.datasetIndex !== 3 &&
-              tooltipItem.datasetIndex !== 4 &&
-              tooltipItem.datasetIndex !== 5 &&
-              tooltipItem.datasetIndex !== 6
-            );
-          },
-          callbacks: {
-            title: function (): string {
-              return "";
-            },
-
-            beforeLabel: function (tooltipItem): string {
-              if (tooltipItem.datasetIndex !== 0) {
-                const resultData = tooltipItem.dataset.data[
-                  tooltipItem.dataIndex
-                ] as AccChartData;
-                return `error rate: ${Numbers.roundTo2(
-                  resultData.errorRate,
-                )}%\nacc: ${Numbers.roundTo2(100 - resultData.errorRate)}%`;
-              }
-              const resultData = tooltipItem.dataset.data[
-                tooltipItem.dataIndex
-              ] as HistoryChartData;
-              let label =
-                `${Config.typingSpeedUnit}: ${resultData.wpm}` +
-                "\n" +
-                `raw: ${resultData.raw}` +
-                "\n" +
-                `acc: ${resultData.acc}` +
-                "\n\n" +
-                `mode: ${resultData.mode} `;
-
-              if (resultData.mode === "time") {
-                label += resultData.mode2;
-              } else if (resultData.mode === "words") {
-                label += resultData.mode2;
-              }
-
-              let diff = resultData.difficulty ?? "normal";
-              label += `\ndifficulty: ${diff}`;
-
-              label +=
-                "\n" +
-                `punctuation: ${resultData.punctuation}` +
-                "\n" +
-                `language: ${resultData.language}` +
-                `${resultData.isPb ? "\n\nnew personal best" : ""}` +
-                "\n\n" +
-                `date: ${format(
-                  new Date(resultData.timestamp),
-                  "dd MMM yyyy HH:mm",
-                )}`;
-
-              return label;
-            },
-            label: function (): string {
-              return "";
-            },
-            afterLabel: function (tooltip): string {
-              accountHistoryActiveIndex = tooltip.dataIndex;
-              return "";
-            },
-          },
-        },
-      },
-    },
-  },
-);
-
-export const accountActivity = new ChartWithUpdateColors<
-  "bar" | "line",
-  ActivityChartDataPoint[],
-  string,
-  "count" | "avgWpm"
->(
-  document.querySelector(
-    ".pageAccount #accountActivityChart",
-  ) as HTMLCanvasElement,
-  {
-    type: "bar",
-    data: {
-      labels: [],
-      datasets: [
-        {
-          yAxisID: "count",
-          label: "Seconds",
-          data: [],
-          trendlineLinear: {
-            style: "rgba(255,105,180, .8)",
-            lineStyle: "dotted",
-            width: 2,
-          },
-          order: 3,
-        },
-        {
-          yAxisID: "avgWpm",
-          label: "Average Wpm",
-          data: [],
-          type: "line",
-          order: 2,
-          tension: 0,
-          fill: false,
-        },
-      ],
-    },
-    options: {
-      responsive: true,
-      maintainAspectRatio: false,
-      hover: {
-        mode: "nearest",
-        intersect: false,
-      },
-      scales: {
-        x: {
-          axis: "x",
-          ticks: {
-            autoSkip: true,
-            autoSkipPadding: 20,
-          },
-          type: "time",
-          time: {
-            unit: "day",
-            displayFormats: {
-              day: "d MMM",
-            },
-          },
-          bounds: "ticks",
-          display: true,
-          title: {
-            display: false,
-            text: "Date",
-          },
-          offset: true,
-        },
-        count: {
-          axis: "y",
-          beginAtZero: true,
-          min: 0,
-          ticks: {
-            autoSkip: true,
-            autoSkipPadding: 20,
-            stepSize: 1,
-          },
-          display: true,
-          title: {
-            display: true,
-            text: "Time typing (minutes)",
-          },
-        },
-        avgWpm: {
-          axis: "y",
-          beginAtZero: true,
-          min: 0,
-          ticks: {
-            autoSkip: true,
-            autoSkipPadding: 20,
-            stepSize: 10,
-          },
-          display: true,
-          position: "right",
-          title: {
-            display: true,
-            text: "Average Wpm",
-          },
-          grid: {
-            display: false,
-          },
-        },
-      },
-      plugins: {
-        annotation: {
-          annotations: [],
-        },
-        tooltip: {
-          animation: { duration: 250 },
-          intersect: false,
-          mode: "index",
-          filter: (tooltipItem): boolean => {
-            return tooltipItem.datasetIndex === 0;
-          },
-          callbacks: {
-            title: function (tooltipItem): string {
-              const firstItem = tooltipItem[0] as TooltipItem<"bar" | "line">;
-              const resultData = firstItem.dataset.data[
-                firstItem.dataIndex
-              ] as ActivityChartDataPoint;
-              return format(new Date(resultData.x), "dd MMM yyyy");
-            },
-            beforeLabel: function (tooltipItem): string {
-              const resultData = tooltipItem.dataset.data[
-                tooltipItem.dataIndex
-              ] as ActivityChartDataPoint;
-              const typingSpeedUnit = getTypingSpeedUnit(
-                Config.typingSpeedUnit,
-              );
-              return `Time Typing: ${DateTime.secondsToString(
-                Math.round(resultData.y * 60),
-                true,
-                true,
-              )}\nTests Completed: ${
-                resultData.amount
-              }\nRestarts per test: ${Numbers.roundTo2(
-                (resultData.restarts ?? 0) / (resultData.amount ?? 0),
-              )}\nHighest ${Config.typingSpeedUnit.toUpperCase()}: ${Numbers.roundTo2(
-                typingSpeedUnit.fromWpm(resultData.maxWpm ?? 0),
-              )}\nAverage ${Config.typingSpeedUnit.toUpperCase()}: ${Numbers.roundTo2(
-                typingSpeedUnit.fromWpm(resultData.avgWpm ?? 0),
-              )}\nAverage Accuracy: ${Numbers.roundTo2(
-                resultData.avgAcc ?? 0,
-              )}%\nAverage Consistency: ${Numbers.roundTo2(
-                resultData.avgCon ?? 0,
-              )}%`;
-            },
-            label: function (): string {
-              return "";
-            },
-          },
-        },
-      },
-    },
-  },
-);
-
-export const accountHistogram = new ChartWithUpdateColors<
-  "bar",
-  ActivityChartDataPoint[],
-  string,
-  "count"
->(
-  document.querySelector(
-    ".pageAccount #accountHistogramChart",
-  ) as HTMLCanvasElement,
-  {
-    type: "bar",
-    data: {
-      labels: [],
-      datasets: [
-        {
-          yAxisID: "count",
-          label: "Tests",
-          data: [],
-        },
-      ],
-    },
-    options: {
-      responsive: true,
-      maintainAspectRatio: false,
-      hover: {
-        mode: "nearest",
-        intersect: false,
-      },
-      scales: {
-        x: {
-          axis: "x",
-          // ticks: {
-          //   autoSkip: true,
-          //   autoSkipPadding: 20,
-          // },
-          bounds: "ticks",
-          display: true,
-          title: {
-            display: false,
-            text: "Bucket",
-          },
-          offset: true,
-        },
-        count: {
-          axis: "y",
-          beginAtZero: true,
-          min: 0,
-          ticks: {
-            autoSkip: true,
-            autoSkipPadding: 20,
-            stepSize: 10,
-          },
-          display: true,
-          title: {
-            display: true,
-            text: "Tests",
-          },
-        },
-      },
-      plugins: {
-        annotation: {
-          annotations: [],
-        },
-        tooltip: {
-          animation: { duration: 250 },
-          intersect: false,
-          mode: "index",
-          // callbacks: {
-          //   title: function (tooltipItem): string {
-          //     const resultData = tooltipItem[0].dataset.data[
-          //       tooltipItem[0].dataIndex
-          //     ] as MonkeyTypes.ActivityChartDataPoint;
-          //     return format(new Date(resultData.x), "dd MMM yyyy");
-          //   },
-          //   beforeLabel: function (tooltipItem): string {
-          //     const resultData = tooltipItem.dataset.data[
-          //       tooltipItem.dataIndex
-          //     ] as MonkeyTypes.ActivityChartDataPoint;
-          //     switch (tooltipItem.datasetIndex) {
-          //       case 0:
-          //         return `Time Typing: ${DateTime.secondsToString(
-          //           Math.round(resultData.y),
-          //           true,
-          //           true
-          //         )}\nTests Completed: ${resultData.amount}`;
-          //       case 1:
-          //         return `Average ${
-          //           Config.typingSpeedUnit
-          //         }: ${Numbers.roundTo2(resultData.y)}`;
-          //       default:
-          //         return "";
-          //     }
-          //   },
-          //   label: function (): string {
-          //     return "";
-          //   },
-          // },
-        },
-      },
-    },
-  },
-);
-
-export const miniResult = new ChartWithUpdateColors<
-  "line" | "scatter",
-  number[],
-  string,
-  "wpm" | "burst" | "error"
->(document.querySelector("#miniResultChartModal canvas") as HTMLCanvasElement, {
-  type: "line",
-  data: {
-    labels: [],
-    datasets: [
-      {
-        label: "wpm",
-        data: [],
-        borderColor: "rgba(125, 125, 125, 1)",
-        borderWidth: 3,
-        yAxisID: "wpm",
-        order: 2,
-        pointRadius: 1,
-      },
-      {
-        label: "burst",
-        data: [],
-        borderColor: "rgba(125, 125, 125, 1)",
-        borderWidth: 3,
-        yAxisID: "burst",
-        order: 3,
-        pointRadius: 1,
-      },
-      {
-        label: "errors",
-        data: [],
-        borderColor: "rgba(255, 125, 125, 1)",
-        pointBackgroundColor: "rgba(255, 125, 125, 1)",
-        borderWidth: 2,
-        order: 1,
-        yAxisID: "error",
-        type: "scatter",
-        pointStyle: "crossRot",
-        pointRadius: function (context): number {
-          const index = context.dataIndex;
-          const value = context.dataset.data[index] as number;
-          return (value ?? 0) <= 0 ? 0 : 3;
-        },
-        pointHoverRadius: function (context): number {
-          const index = context.dataIndex;
-          const value = context.dataset.data[index] as number;
-          return (value ?? 0) <= 0 ? 0 : 5;
-        },
-      },
-    ],
-  },
-  options: {
-    responsive: true,
-    maintainAspectRatio: false,
-    scales: {
-      x: {
-        axis: "x",
-        ticks: {
-          autoSkip: true,
-          autoSkipPadding: 20,
-        },
-        display: true,
-        title: {
-          display: false,
-          text: "Seconds",
-        },
-      },
-      wpm: {
-        axis: "y",
-        display: true,
-        title: {
-          display: true,
-          text: "Words per Minute",
-        },
-        beginAtZero: true,
-        min: 0,
-        ticks: {
-          autoSkip: true,
-          autoSkipPadding: 20,
-        },
-        grid: {
-          display: true,
-        },
-      },
-      burst: {
-        axis: "y",
-        display: false,
-        title: {
-          display: true,
-          text: "Burst Words per Minute",
-        },
-        beginAtZero: true,
-        min: 0,
-        ticks: {
-          autoSkip: true,
-          autoSkipPadding: 20,
-        },
-        grid: {
-          display: false,
-        },
-      },
-      error: {
-        display: true,
-        position: "right",
-        title: {
-          display: true,
-          text: "Errors",
-        },
-        beginAtZero: true,
-        ticks: {
-          precision: 0,
-          autoSkip: true,
-          autoSkipPadding: 20,
-        },
-        grid: {
-          display: false,
-        },
-      },
-    },
-    plugins: {
-      annotation: {
-        annotations: [],
-      },
-      tooltip: {
-        animation: { duration: 250 },
-        mode: "index",
-        intersect: false,
-      },
-    },
-  },
-});
-
-type ButtonBelowChart =
-  | ".toggleResultsOnChart"
-  | ".toggleAccuracyOnChart"
-  | ".toggleAverage10OnChart"
-  | ".toggleAverage100OnChart";
-
-export function updateAccountChartButtons(): void {
-  updateResults();
-  updateAccuracy();
-  updateAverage10();
-  updateAverage100();
-}
-
-function updateAccountChartButton(
-  isActive: boolean,
-  className: ButtonBelowChart,
-): void {
-  isActive
-    ? qs(`.pageAccount ${className}`)?.addClass("active")
-    : qs(`.pageAccount ${className}`)?.removeClass("active");
-}
-
-function updateResults(): void {
-  const resultsOn = Config.accountChart[0] === "on";
-  updateAccountChartButton(resultsOn, ".toggleResultsOnChart");
-
-  accountHistory.getDataset("wpm").hidden = !resultsOn;
-  accountHistory.getDataset("pb").hidden = !resultsOn;
-  accountHistory.getDataset("wpmAvgTen").hidden = !resultsOn;
-  accountHistory.getDataset("wpmAvgHundred").hidden = !resultsOn;
-  accountHistory.getScale("wpm").display = resultsOn;
-}
-
-function updateAccuracy(): void {
-  const resultsOn = Config.accountChart[0] === "on";
-  const accOn = Config.accountChart[1] === "on";
-  updateAccountChartButton(accOn, ".toggleAccuracyOnChart");
-
-  accountHistory.getDataset("acc").hidden = !accOn;
-  accountHistory.getDataset("accAvgTen").hidden = !accOn;
-  accountHistory.getDataset("accAvgHundred").hidden = !accOn;
-  accountHistory.getScale("acc").display = accOn;
-
-  if (resultsOn) {
-    accountHistory.getScale("acc").min = 0;
-    accountHistory.getScale("accAvgTen").min = 0;
-    accountHistory.getScale("accAvgHundred").min = 0;
-  } else {
-    const minAccRoundedTo10 =
-      Math.floor(
-        Math.min(...accountHistory.getDataset("acc").data.map((x) => x.y)) / 5,
-      ) * 5;
-
-    accountHistory.getScale("acc").min = minAccRoundedTo10;
-    accountHistory.getScale("accAvgTen").min = minAccRoundedTo10;
-    accountHistory.getScale("accAvgHundred").min = minAccRoundedTo10;
-  }
-}
-
-function updateAverage10(): void {
-  const resultsOn = Config.accountChart[0] === "on";
-  const accOn = Config.accountChart[1] === "on";
-  const avg10On = Config.accountChart[2] === "on";
-  updateAccountChartButton(avg10On, ".toggleAverage10OnChart");
-
-  if (accOn) {
-    accountHistory.getDataset("accAvgTen").hidden = !avg10On;
-  }
-  if (resultsOn) {
-    accountHistory.getDataset("wpmAvgTen").hidden = !avg10On;
-  }
-}
-
-function updateAverage100(): void {
-  const resultsOn = Config.accountChart[0] === "on";
-  const accOn = Config.accountChart[1] === "on";
-  const avg100On = Config.accountChart[3] === "on";
-  updateAccountChartButton(avg100On, ".toggleAverage100OnChart");
-
-  if (accOn) {
-    accountHistory.getDataset("accAvgHundred").hidden = !avg100On;
-  }
-  if (resultsOn) {
-    accountHistory.getDataset("wpmAvgHundred").hidden = !avg100On;
-  }
-}
-
 async function updateColors<
   TType extends ChartType = "bar" | "line" | "scatter",
-  TData =
-    | HistoryChartData[]
-    | AccChartData[]
-    | ActivityChartDataPoint[]
-    | number[],
+  TData = number[],
   TLabel = string,
 >(
   chart: ChartWithUpdateColors<TType, TData, TLabel>,
@@ -1163,35 +360,6 @@ async function updateColors<
     return;
   }
 
-  if (chart.id === miniResult.id) {
-    const c = chart as unknown as typeof miniResult;
-
-    const wpm = c.getDataset("wpm");
-    wpm.backgroundColor = "transparent";
-    wpm.borderColor = colors.main;
-    wpm.pointBackgroundColor = colors.main;
-    wpm.pointBorderColor = colors.main;
-
-    const error = c.getDataset("error");
-    error.backgroundColor = colors.error;
-    error.borderColor = colors.error;
-    error.pointBackgroundColor = colors.error;
-    error.pointBorderColor = colors.error;
-
-    const burst = c.getDataset("burst");
-    burst.backgroundColor = blendTwoHexColors(
-      colors.subAlt,
-      colors.subAlt + "00",
-      0.75,
-    );
-    burst.borderColor = colors.sub;
-    burst.pointBackgroundColor = colors.sub;
-    burst.pointBorderColor = colors.sub;
-
-    chart.update("resize");
-    return;
-  }
-
   //@ts-expect-error it's too difficult to figure out these types, but this works
   chart.data.datasets[0].borderColor = (ctx): string => {
     // oxlint-disable-next-line no-unsafe-member-access
@@ -1348,16 +516,8 @@ function setDefaultFontFamily(font: string): void {
 
 createDebouncedEffectOn(125, getTheme, (theme) => {
   void result.updateColors(theme);
-  void accountHistory.updateColors(theme);
-  void accountHistogram.updateColors(theme);
-  void accountActivity.updateColors(theme);
-  void miniResult.updateColors(theme);
 });
 
 configEvent.subscribe(({ key, newValue }) => {
-  if (key === "accountChart" && getActivePage() === "account") {
-    updateAccountChartButtons();
-    accountHistory.update();
-  }
   if (key === "fontFamily") setDefaultFontFamily(newValue);
 });
diff --git a/frontend/src/ts/controllers/page-controller.ts b/frontend/src/ts/controllers/page-controller.ts
index b777f0eec1f3..1a30cb96e34c 100644
--- a/frontend/src/ts/controllers/page-controller.ts
+++ b/frontend/src/ts/controllers/page-controller.ts
@@ -6,7 +6,6 @@ import {
   setSelectedProfileName,
 } from "../states/core";
 import * as Settings from "../pages/settings";
-import * as Account from "../pages/account";
 import * as PageTest from "../pages/test";
 import * as PageLoading from "../pages/loading";
 import * as Friends from "../pages/friends";
@@ -30,6 +29,9 @@ import {
   readGetParameters,
 } from "../states/leaderboard-selection";
 import { configurationPromise as serverConfigurationPromise } from "../ape/server-configuration";
+import { getSnapshot } from "../db";
+import * as TodayTracker from "../test/today-tracker";
+import { isResultsReady, waitForResultsReady } from "../collections/results";
 
 type ChangeOptions = {
   force?: boolean;
@@ -43,7 +45,34 @@ const pages = {
   test: PageTest.page,
   settings: Settings.page,
   about: solidPage("about"),
-  account: Account.page,
+  account: solidPage("account", {
+    loadingOptions: {
+      loadingMode: () => {
+        if (isResultsReady()) {
+          return "none";
+        } else {
+          return "sync";
+        }
+      },
+      loadingPromise: async () => {
+        if (getSnapshot() === null || getSnapshot() === undefined) {
+          throw new Error(
+            "Looks like your account data didn't download correctly. Please refresh the page.<br>If this error persists, please contact support.",
+          );
+        }
+        await waitForResultsReady();
+        TodayTracker.addAllFromToday();
+      },
+      style: "bar",
+      keyframes: [
+        {
+          percentage: 90,
+          durationMs: 2000,
+          text: "Downloading results...",
+        },
+      ],
+    },
+  }),
   login: solidPage("login"),
   profile: solidPage("profile", {
     beforeShow: async (options) => {
diff --git a/frontend/src/ts/controllers/preset-controller.ts b/frontend/src/ts/controllers/preset-controller.ts
index fce7a6c02732..7475af259362 100644
--- a/frontend/src/ts/controllers/preset-controller.ts
+++ b/frontend/src/ts/controllers/preset-controller.ts
@@ -8,9 +8,14 @@ import {
   showSuccessNotification,
 } from "../states/notifications";
 import * as TestLogic from "../test/test-logic";
-import * as TagController from "./tag-controller";
+import {
+  clearActiveTags,
+  setTagActive,
+  saveActiveToLocalStorage,
+} from "../collections/tags";
 import { SnapshotPreset } from "../constants/default-snapshot";
 import { saveFullConfigToLocalStorage } from "../config/persistence";
+import * as ModesNotice from "../elements/modes-notice";
 
 export async function apply(_id: string): Promise<void> {
   const snapshot = DB.getSnapshot();
@@ -34,14 +39,15 @@ export async function apply(_id: string): Promise<void> {
     !isPartialPreset(presetToApply) ||
     presetToApply.settingGroups?.includes("behavior")
   ) {
-    TagController.clear(true);
+    clearActiveTags(true);
     if (presetToApply.config.tags) {
       for (const tagId of presetToApply.config.tags) {
-        TagController.set(tagId, true, false);
+        setTagActive(tagId, true, false);
       }
-      TagController.saveActiveToLocalStorage();
+      saveActiveToLocalStorage();
     }
   }
+  void ModesNotice.update();
   TestLogic.restart();
   showSuccessNotification("Preset applied", { durationMs: 2000 });
   saveFullConfigToLocalStorage();
diff --git a/frontend/src/ts/controllers/tag-controller.ts b/frontend/src/ts/controllers/tag-controller.ts
deleted file mode 100644
index c1a414c9eba0..000000000000
--- a/frontend/src/ts/controllers/tag-controller.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import { z } from "zod";
-import * as DB from "../db";
-import * as ModesNotice from "../elements/modes-notice";
-import { LocalStorageWithSchema } from "../utils/local-storage-with-schema";
-import { IdSchema } from "@monkeytype/schemas/util";
-import { authEvent } from "../events/auth";
-
-const activeTagsLS = new LocalStorageWithSchema({
-  key: "activeTags",
-  schema: z.array(IdSchema),
-  fallback: [],
-});
-
-export function saveActiveToLocalStorage(): void {
-  const tags: string[] = [];
-
-  DB.getSnapshot()?.tags?.forEach((tag) => {
-    if (tag.active === true) {
-      tags.push(tag._id);
-    }
-  });
-
-  activeTagsLS.set(tags);
-}
-
-export function clear(nosave = false): void {
-  const snapshot = DB.getSnapshot();
-  if (!snapshot) return;
-
-  snapshot.tags = snapshot.tags?.map((tag) => {
-    tag.active = false;
-
-    return tag;
-  });
-
-  DB.setSnapshot(snapshot);
-  void ModesNotice.update();
-  if (!nosave) saveActiveToLocalStorage();
-}
-
-export function set(tagid: string, state: boolean, nosave = false): void {
-  const snapshot = DB.getSnapshot();
-  if (!snapshot) return;
-
-  snapshot.tags = snapshot.tags?.map((tag) => {
-    if (tag._id === tagid) {
-      tag.active = state;
-    }
-
-    return tag;
-  });
-
-  DB.setSnapshot(snapshot);
-  void ModesNotice.update();
-  if (!nosave) saveActiveToLocalStorage();
-}
-
-export function toggle(tagid: string, nosave = false): void {
-  DB.getSnapshot()?.tags?.forEach((tag) => {
-    if (tag._id === tagid) {
-      if (tag.active === undefined) {
-        tag.active = true;
-      } else {
-        tag.active = !tag.active;
-      }
-    }
-  });
-  void ModesNotice.update();
-  if (!nosave) saveActiveToLocalStorage();
-}
-
-export function loadActiveFromLocalStorage(): void {
-  const newTags = activeTagsLS.get();
-  for (const tag of newTags) {
-    toggle(tag, true);
-  }
-  saveActiveToLocalStorage();
-}
-
-authEvent.subscribe((event) => {
-  if (event.type === "snapshotUpdated" && event.data.isInitial) {
-    loadActiveFromLocalStorage();
-  }
-});
diff --git a/frontend/src/ts/db.ts b/frontend/src/ts/db.ts
index d07e2f126c58..de2084a2a397 100644
--- a/frontend/src/ts/db.ts
+++ b/frontend/src/ts/db.ts
@@ -5,7 +5,6 @@ import {
 } from "./states/notifications";
 import { getAuthenticatedUser } from "./firebase";
 import { isAuthenticated } from "./states/core";
-import { lastElementFromArray } from "./utils/arrays";
 import * as Dates from "date-fns";
 import {
   TestActivityCalendar,
@@ -25,7 +24,6 @@ import {
   Snapshot,
   SnapshotPreset,
   SnapshotResult,
-  SnapshotUserTag,
 } from "./constants/default-snapshot";
 import { getFirstDayOfTheWeek } from "./utils/date-and-time";
 import { Language } from "@monkeytype/schemas/languages";
@@ -35,6 +33,8 @@ import {
   get as getServerConfiguration,
 } from "./ape/server-configuration";
 import { Connection } from "@monkeytype/schemas/connections";
+import { insertLocalResult } from "./collections/results";
+import { fillResultFilterPresetsCollection } from "./collections/result-filter-presets";
 import {
   setLastResult,
   setSnapshot as setSolidSnapshot,
@@ -42,6 +42,8 @@ import {
 import { XpBreakdown } from "@monkeytype/schemas/results";
 import { setXpBarData } from "./states/header";
 import { FunboxMetadata } from "@monkeytype/funbox";
+import { fillTagsCollection, __nonReactive } from "./collections/tags";
+import { updateTagsInFilterStorage } from "./states/result-filters";
 
 let dbSnapshot: Snapshot | undefined;
 const firstDayOfTheWeek = getFirstDayOfTheWeek();
@@ -175,7 +177,6 @@ export async function initSnapshot(): Promise<Snapshot | false> {
     snap.inboxUnreadSize = userData.inboxUnreadSize ?? 0;
     snap.streak = userData?.streak?.length ?? 0;
     snap.maxStreak = userData?.streak?.maxLength ?? 0;
-    snap.filterPresets = userData.resultFilterPresets ?? [];
     snap.isPremium = userData?.isPremium ?? false;
     snap.allTimeLbs = userData.allTimeLbs;
 
@@ -196,40 +197,8 @@ export async function initSnapshot(): Promise<Snapshot | false> {
 
     snap.customThemes = userData.customThemes ?? [];
 
-    // const userDataTags: MonkeyTypes.UserTagWithDisplay[] = userData.tags ?? [];
-
-    // userDataTags.forEach((tag) => {
-    //   tag.display = tag.name.replaceAll("_", " ");
-    //   tag.personalBests ??= {
-    //     time: {},
-    //     words: {},
-    //     quote: {},
-    //     zen: {},
-    //     custom: {},
-    //   };
-
-    //   for (const mode of ["time", "words", "quote", "zen", "custom"]) {
-    //     tag.personalBests[mode as keyof PersonalBests] ??= {};
-    //   }
-    // });
-
-    // snap.tags = userDataTags;
-
-    snap.tags =
-      userData.tags?.map((tag) => ({
-        ...tag,
-        display: tag.name.replace(/_/g, " "),
-      })) ?? [];
-
-    snap.tags = snap.tags?.sort((a, b) => {
-      if (a.name > b.name) {
-        return 1;
-      } else if (a.name < b.name) {
-        return -1;
-      } else {
-        return 0;
-      }
-    });
+    fillTagsCollection(userData.tags ?? []);
+    updateTagsInFilterStorage(userData.tags?.map((it) => it._id) ?? []);
 
     if (presetsData !== undefined && presetsData !== null) {
       const presetsWithDisplay = presetsData.map((preset) => {
@@ -255,6 +224,8 @@ export async function initSnapshot(): Promise<Snapshot | false> {
 
     snap.connections = convertConnections(connectionsData);
 
+    fillResultFilterPresetsCollection(userData.resultFilterPresets ?? []);
+
     dbSnapshot = snap;
 
     return dbSnapshot;
@@ -266,66 +237,6 @@ export async function initSnapshot(): Promise<Snapshot | false> {
   }
 }
 
-export async function getUserResults(offset?: number): Promise<boolean> {
-  if (!isAuthenticated()) return false;
-
-  if (!dbSnapshot) return false;
-  if (
-    dbSnapshot.results !== undefined &&
-    (offset === undefined || dbSnapshot.results.length > offset)
-  ) {
-    return false;
-  }
-
-  const response = await Ape.results.get({ query: { offset } });
-
-  if (response.status !== 200) {
-    showErrorNotification("Error getting results", { response });
-    return false;
-  }
-
-  //another check in case user logs out while waiting for response
-  if (!isAuthenticated()) return false;
-
-  const results: SnapshotResult<Mode>[] = response.body.data.map((result) => {
-    result.bailedOut ??= false;
-    result.blindMode ??= false;
-    result.lazyMode ??= false;
-    result.difficulty ??= "normal";
-    result.funbox ??= [];
-    result.language ??= "english";
-    result.numbers ??= false;
-    result.punctuation ??= false;
-    result.numbers ??= false;
-    result.quoteLength ??= -1;
-    result.restartCount ??= 0;
-    result.incompleteTestSeconds ??= 0;
-    result.afkDuration ??= 0;
-    result.tags ??= [];
-    return result as SnapshotResult<Mode>;
-  });
-  results?.sort((a, b) => b.timestamp - a.timestamp);
-
-  if (dbSnapshot.results !== undefined && dbSnapshot.results.length > 0) {
-    //merge
-    const oldestTimestamp = lastElementFromArray(dbSnapshot.results)
-      ?.timestamp as number;
-    const resultsWithoutDuplicates = results.filter(
-      (it) => it.timestamp < oldestTimestamp,
-    );
-    dbSnapshot.results.push(...resultsWithoutDuplicates);
-  } else {
-    dbSnapshot.results = results;
-  }
-
-  setLastResult(results[0]);
-  return true;
-}
-
-function _getCustomThemeById(themeID: string): CustomTheme | undefined {
-  return dbSnapshot?.customThemes?.find((t) => t._id === themeID);
-}
-
 export async function addCustomTheme(
   theme: Omit<CustomTheme, "_id">,
 ): Promise<boolean> {
@@ -414,187 +325,6 @@ export async function deleteCustomTheme(themeId: string): Promise<boolean> {
   return true;
 }
 
-export async function getUserAverage10<M extends Mode>(
-  mode: M,
-  mode2: Mode2<M>,
-  punctuation: boolean,
-  numbers: boolean,
-  language: string,
-  difficulty: Difficulty,
-  lazyMode: boolean,
-): Promise<[number, number]> {
-  const snapshot = getSnapshot();
-
-  if (!snapshot) return [0, 0];
-
-  function cont(): [number, number] {
-    const activeTagIds: string[] = [];
-    snapshot?.tags?.forEach((tag) => {
-      if (tag.active === true) {
-        activeTagIds.push(tag._id);
-      }
-    });
-
-    let wpmSum = 0;
-    let accSum = 0;
-    let last10Wpm = 0;
-    let last10Acc = 0;
-    let count = 0;
-    let last10Count = 0;
-
-    if (snapshot?.results !== undefined) {
-      for (const result of snapshot.results) {
-        if (
-          result.mode === mode &&
-          (result.punctuation ?? false) === punctuation &&
-          (result.numbers ?? false) === numbers &&
-          result.language === language &&
-          result.difficulty === difficulty &&
-          (result.lazyMode === lazyMode ||
-            (result.lazyMode === undefined && !lazyMode)) &&
-          (activeTagIds.length === 0 ||
-            activeTagIds.some((tagId) => result.tags?.includes(tagId)))
-        ) {
-          // Continue if the mode2 doesn't match and it's not a quote
-          if (
-            `${result.mode2}` !== `${mode2 as string | number}` &&
-            mode !== "quote"
-          ) {
-            //using template strings because legacy results might use numbers in mode2
-            continue;
-          }
-
-          // Grab the most recent results from the current mode
-          if (last10Count < 10) {
-            last10Wpm += result.wpm;
-            last10Acc += result.acc;
-            last10Count++;
-          }
-
-          // Check if the mode2 matches and if it does, add it to the sum, for quotes, this is the quote id
-          if (`${result.mode2}` === `${mode2 as string | number}`) {
-            //using template strings because legacy results might use numbers in mode2
-            wpmSum += result.wpm;
-            accSum += result.acc;
-            count++;
-
-            if (count >= 10) break;
-          }
-        }
-      }
-    }
-
-    // Return the last 10 average wpm & acc for quote
-    // if the current quote id has never been completed before by the user
-    if (count === 0 && mode === "quote") {
-      return [last10Wpm / last10Count, last10Acc / last10Count];
-    }
-
-    return [wpmSum / count, accSum / count];
-  }
-
-  const retval: [number, number] =
-    snapshot === null || (await getUserResults()) === null ? [0, 0] : cont();
-
-  return retval;
-}
-
-export async function getUserDailyBest<M extends Mode>(
-  mode: M,
-  mode2: Mode2<M>,
-  punctuation: boolean,
-  numbers: boolean,
-  language: string,
-  difficulty: Difficulty,
-  lazyMode: boolean,
-): Promise<number> {
-  const snapshot = getSnapshot();
-
-  if (!snapshot) return 0;
-
-  function cont(): number {
-    const activeTagIds: string[] = [];
-    snapshot?.tags?.forEach((tag) => {
-      if (tag.active === true) {
-        activeTagIds.push(tag._id);
-      }
-    });
-
-    let bestWpm = 0;
-
-    if (snapshot?.results !== undefined) {
-      for (const result of snapshot.results) {
-        if (
-          result.mode === mode &&
-          (result.punctuation ?? false) === punctuation &&
-          (result.numbers ?? false) === numbers &&
-          result.language === language &&
-          result.difficulty === difficulty &&
-          (result.lazyMode === lazyMode ||
-            (result.lazyMode === undefined && !lazyMode)) &&
-          (activeTagIds.length === 0 ||
-            activeTagIds.some((tagId) => result.tags?.includes(tagId)))
-        ) {
-          if (result.timestamp < Date.now() - 86400000) {
-            continue;
-          }
-
-          // Continue if the mode2 doesn't match and it's not a quote
-          if (
-            `${result.mode2}` !== `${mode2 as string | number}` &&
-            mode !== "quote"
-          ) {
-            //using template strings because legacy results might use numbers in mode2
-            continue;
-          }
-
-          if (result.wpm > bestWpm) {
-            bestWpm = result.wpm;
-          }
-        }
-      }
-    }
-
-    return bestWpm;
-  }
-
-  const retval: number =
-    snapshot === null || (await getUserResults()) === null ? 0 : cont();
-
-  return retval;
-}
-
-export async function getActiveTagsPB<M extends Mode>(
-  mode: M,
-  mode2: Mode2<M>,
-  punctuation: boolean,
-  numbers: boolean,
-  language: string,
-  difficulty: Difficulty,
-  lazyMode: boolean,
-): Promise<number> {
-  const snapshot = getSnapshot();
-  if (!snapshot) return 0;
-
-  let tagPbWpm = 0;
-  for (const tag of snapshot.tags) {
-    if (!tag.active) continue;
-    const currTagPB = await getLocalTagPB(
-      tag._id,
-      mode,
-      mode2,
-      punctuation,
-      numbers,
-      language,
-      difficulty,
-      lazyMode,
-    );
-    if (currTagPB > tagPbWpm) tagPbWpm = currTagPB;
-  }
-
-  return tagPbWpm;
-}
-
 export async function getLocalPB<M extends Mode>(
   mode: M,
   mode2: Mode2<M>,
@@ -700,230 +430,6 @@ function saveLocalPB<M extends Mode>(
   }
 }
 
-export async function getLocalTagPB<M extends Mode>(
-  tagId: string,
-  mode: M,
-  mode2: Mode2<M>,
-  punctuation: boolean,
-  numbers: boolean,
-  language: string,
-  difficulty: Difficulty,
-  lazyMode: boolean,
-): Promise<number> {
-  if (dbSnapshot === null) return 0;
-
-  let ret = 0;
-
-  const filteredtag = (getSnapshot()?.tags ?? []).find((t) => t._id === tagId);
-
-  if (filteredtag === undefined) return ret;
-
-  filteredtag.personalBests ??= {
-    time: {},
-    words: {},
-    quote: {},
-    zen: {},
-    custom: {},
-  };
-
-  filteredtag.personalBests[mode] ??= {
-    [mode2]: [],
-  };
-
-  filteredtag.personalBests[mode][mode2] ??=
-    [] as unknown as PersonalBests[M][Mode2<M>];
-
-  const personalBests = (filteredtag.personalBests[mode][mode2] ??
-    []) as PersonalBest[];
-
-  ret =
-    personalBests.find(
-      (pb) =>
-        (pb.punctuation ?? false) === punctuation &&
-        (pb.numbers ?? false) === numbers &&
-        pb.difficulty === difficulty &&
-        pb.language === language &&
-        (pb.lazyMode === lazyMode || (pb.lazyMode === undefined && !lazyMode)),
-    )?.wpm ?? 0;
-
-  return ret;
-}
-
-export async function saveLocalTagPB<M extends Mode>(
-  tagId: string,
-  mode: M,
-  mode2: Mode2<M>,
-  punctuation: boolean,
-  numbers: boolean,
-  language: Language,
-  difficulty: Difficulty,
-  lazyMode: boolean,
-  wpm: number,
-  acc: number,
-  raw: number,
-  consistency: number,
-): Promise<number | undefined> {
-  if (!dbSnapshot) return;
-  if (mode === "quote") return;
-  function cont(): void {
-    const filteredtag = dbSnapshot?.tags?.find(
-      (t) => t._id === tagId,
-    ) as SnapshotUserTag;
-
-    filteredtag.personalBests ??= {
-      time: {},
-      words: {},
-      quote: {},
-      zen: {},
-      custom: {},
-    };
-
-    filteredtag.personalBests[mode] ??= {
-      [mode2]: [],
-    };
-
-    filteredtag.personalBests[mode][mode2] ??=
-      [] as unknown as PersonalBests[M][Mode2<M>];
-
-    try {
-      let found = false;
-
-      (
-        filteredtag.personalBests[mode][mode2] as unknown as PersonalBest[]
-      ).forEach((pb) => {
-        if (
-          (pb.punctuation ?? false) === punctuation &&
-          (pb.numbers ?? false) === numbers &&
-          pb.difficulty === difficulty &&
-          pb.language === language &&
-          (pb.lazyMode === lazyMode || (pb.lazyMode === undefined && !lazyMode))
-        ) {
-          found = true;
-          pb.wpm = wpm;
-          pb.acc = acc;
-          pb.raw = raw;
-          pb.timestamp = Date.now();
-          pb.consistency = consistency;
-          pb.lazyMode = lazyMode;
-        }
-      });
-      if (!found) {
-        //nothing found
-        (
-          filteredtag.personalBests[mode][mode2] as unknown as PersonalBest[]
-        ).push({
-          language,
-          difficulty,
-          lazyMode,
-          punctuation,
-          numbers,
-          wpm,
-          acc,
-          raw,
-          timestamp: Date.now(),
-          consistency,
-        });
-      }
-    } catch (e) {
-      //that mode or mode2 is not found
-      filteredtag.personalBests = {
-        time: {},
-        words: {},
-        quote: {},
-        zen: {},
-        custom: {},
-      };
-      filteredtag.personalBests[mode][mode2] = [
-        {
-          language: language,
-          difficulty: difficulty,
-          lazyMode: lazyMode,
-          punctuation: punctuation,
-          numbers: numbers,
-          wpm: wpm,
-          acc: acc,
-          raw: raw,
-          timestamp: Date.now(),
-          consistency: consistency,
-        },
-      ] as unknown as PersonalBests[M][Mode2<M>];
-    }
-  }
-
-  if (dbSnapshot !== null) {
-    cont();
-  }
-
-  return;
-}
-
-export function deleteLocalTag(tagId: string): void {
-  getSnapshot()?.results?.forEach((result) => {
-    const tagIndex = result.tags.indexOf(tagId);
-    if (tagIndex > -1) {
-      result.tags.splice(tagIndex, 1);
-    }
-  });
-}
-
-export async function updateLocalTagPB<M extends Mode>(
-  tagId: string,
-  mode: M,
-  mode2: Mode2<M>,
-  punctuation: boolean,
-  numbers: boolean,
-  language: Language,
-  difficulty: Difficulty,
-  lazyMode: boolean,
-): Promise<void> {
-  if (dbSnapshot === null) return;
-
-  const filteredtag = (getSnapshot()?.tags ?? []).find((t) => t._id === tagId);
-
-  if (filteredtag === undefined) return;
-
-  const pb = {
-    wpm: 0,
-    acc: 0,
-    rawWpm: 0,
-    consistency: 0,
-  };
-
-  getSnapshot()?.results?.forEach((result) => {
-    if (result.tags.includes(tagId) && result.wpm > pb.wpm) {
-      if (
-        result.mode === mode &&
-        result.mode2 === mode2 &&
-        result.punctuation === punctuation &&
-        result.numbers === numbers &&
-        result.language === language &&
-        result.difficulty === difficulty &&
-        result.lazyMode === lazyMode
-      ) {
-        pb.wpm = result.wpm;
-        pb.acc = result.acc;
-        pb.rawWpm = result.rawWpm;
-        pb.consistency = result.consistency;
-      }
-    }
-  });
-
-  await saveLocalTagPB(
-    tagId,
-    mode,
-    mode2,
-    punctuation,
-    numbers,
-    language,
-    difficulty,
-    lazyMode,
-    pb.wpm,
-    pb.acc,
-    pb.rawWpm,
-    pb.consistency,
-  );
-}
-
 export async function updateLbMemory<M extends Mode>(
   mode: M,
   mode2: Mode2<M> | undefined,
@@ -973,9 +479,7 @@ export function saveLocalResult(data: SaveLocalResultData): void {
   if (!snapshot) return;
 
   if (data.result !== undefined) {
-    if (snapshot?.results !== undefined) {
-      snapshot.results.unshift(data.result);
-    }
+    void insertLocalResult({ result: data.result });
     setLastResult(data.result);
     if (snapshot.testActivity !== undefined) {
       snapshot.testActivity.increment(new Date(data.result.timestamp));
@@ -1184,36 +688,3 @@ export function isFriend(uid: string | undefined): boolean {
     ([receiverUid, status]) => receiverUid === uid && status === "accepted",
   );
 }
-
-// export async function DB.getLocalTagPB(tagId) {
-//   function cont() {
-//     let ret = 0;
-//     try {
-//       ret = dbSnapshot.tags.filter((t) => t.id === tagId)[0].pb;
-//       if (ret === undefined) {
-//         ret = 0;
-//       }
-//       return ret;
-//     } catch (e) {
-//       return ret;
-//     }
-//   }
-
-//   const retval = dbSnapshot !== null ? cont() : undefined;
-
-//   return retval;
-// }
-
-// export async functio(tagId, wpm) {
-//   function cont() {
-//     dbSnapshot.tags.forEach((tag) => {
-//       if (tag._id === tagId) {
-//         tag.pb = wpm;
-//       }
-//     });
-//   }
-
-//   if (dbSnapshot !== null) {
-//     cont();
-//   }
-// }
diff --git a/frontend/src/ts/elements/account/result-filters.ts b/frontend/src/ts/elements/account/result-filters.ts
deleted file mode 100644
index e2ccf7ecc702..000000000000
--- a/frontend/src/ts/elements/account/result-filters.ts
+++ /dev/null
@@ -1,969 +0,0 @@
-import * as Misc from "../../utils/misc";
-import * as Strings from "../../utils/strings";
-import * as DB from "../../db";
-import { Config } from "../../config/store";
-import {
-  showNoticeNotification,
-  showErrorNotification,
-  showSuccessNotification,
-} from "../../states/notifications";
-import Ape from "../../ape/index";
-import { showLoaderBar, hideLoaderBar } from "../../states/loader-bar";
-import SlimSelect from "slim-select";
-import { QuoteLength } from "@monkeytype/schemas/configs";
-import {
-  ResultFilters,
-  ResultFiltersSchema,
-  ResultFiltersGroup,
-  ResultFiltersGroupItem,
-} from "@monkeytype/schemas/users";
-import { LocalStorageWithSchema } from "../../utils/local-storage-with-schema";
-import defaultResultFilters from "../../constants/default-result-filters";
-import { getAllFunboxes } from "@monkeytype/funbox";
-import { Snapshot } from "../../constants/default-snapshot";
-import { LanguageList } from "../../constants/languages";
-import { authEvent } from "../../events/auth";
-import { sanitize } from "../../utils/sanitize";
-import { qs, qsa } from "../../utils/dom";
-
-export function mergeWithDefaultFilters(
-  filters: Partial<ResultFilters>,
-): ResultFilters {
-  try {
-    const merged = {} as ResultFilters;
-    for (const groupKey of Misc.typedKeys(defaultResultFilters)) {
-      if (groupKey === "_id") {
-        let id = filters[groupKey] ?? defaultResultFilters[groupKey];
-        if (id === "default-result-filters-id" || id === "") {
-          id = "default";
-        }
-        merged[groupKey] = id;
-      } else if (groupKey === "name") {
-        merged[groupKey] = filters[groupKey] ?? defaultResultFilters[groupKey];
-      } else {
-        // @ts-expect-error i cant figure this out
-        merged[groupKey] = {
-          ...defaultResultFilters[groupKey],
-          ...filters[groupKey],
-        };
-      }
-    }
-    return merged;
-  } catch (e) {
-    return defaultResultFilters;
-  }
-}
-
-const resultFiltersLS = new LocalStorageWithSchema({
-  key: "resultFilters",
-  schema: ResultFiltersSchema,
-  fallback: defaultResultFilters,
-  migrate: (unknown, _issues) => {
-    if (!Misc.isObject(unknown)) {
-      return defaultResultFilters;
-    }
-    return mergeWithDefaultFilters(
-      sanitize(ResultFiltersSchema.partial().strip(), unknown as ResultFilters),
-    );
-  },
-});
-
-type Option = {
-  id: string;
-  value: string;
-  text: string;
-  html: string;
-  selected: boolean;
-  display: boolean;
-  disabled: boolean;
-  placeholder: boolean;
-  class: string;
-  style: string;
-  data: {
-    [key: string]: string;
-  };
-  mandatory: boolean;
-};
-
-const groupsUsingSelect = new Set(["language", "funbox", "tags"]);
-const groupSelects: Partial<Record<keyof ResultFilters, SlimSelect>> = {};
-
-// current activated filter
-let filters = defaultResultFilters;
-
-function save(): void {
-  resultFiltersLS.set(filters);
-}
-
-export async function load(): Promise<void> {
-  try {
-    filters = mergeWithDefaultFilters(resultFiltersLS.get());
-
-    const newTags: Record<string, boolean> = { none: false };
-    Object.keys(defaultResultFilters.tags).forEach((tag) => {
-      if (filters.tags[tag] !== undefined) {
-        newTags[tag] = filters.tags[tag];
-      } else {
-        newTags[tag] = true;
-      }
-    });
-
-    filters.tags = newTags;
-    save();
-  } catch {
-    console.log("error in loading result filters");
-    filters = defaultResultFilters;
-    save();
-  }
-}
-
-async function updateFilterPresets(): Promise<void> {
-  const parent = document.querySelector(".pageAccount .presetFilterButtons");
-  const buttons = document.querySelector(
-    ".pageAccount .presetFilterButtons .filterBtns",
-  );
-
-  if (!parent || !buttons) return;
-
-  buttons.innerHTML = "";
-
-  const filterPresets = DB.getSnapshot()?.filterPresets ?? [];
-
-  if (filterPresets.length > 0) {
-    let html = "";
-
-    for (const filter of filterPresets) {
-      html += `<div class="filterPresets">
-      <div class="select-filter-preset button" data-id="${
-        filter._id
-      }">${filter.name.replace(/_/g, " ")}</div>
-      <div class="button delete-filter-preset" data-id="${filter._id}">
-        <i class="fas fa-fw fa-trash"></i>
-      </div>
-    </div>`;
-    }
-
-    buttons.innerHTML = html;
-    parent.classList.remove("hidden");
-  } else {
-    parent.classList.add("hidden");
-  }
-}
-
-// sets the current filter to be a user custom filter
-export async function setFilterPreset(id: string): Promise<void> {
-  const filter = DB.getSnapshot()?.filterPresets.find(
-    (filter) => filter._id === id,
-  );
-  if (filter) {
-    // deep copy filter
-    filters = verifyResultFiltersStructure(filter);
-
-    save();
-    updateActive();
-  }
-
-  // make all filter preset butons inactive
-  qsa(
-    `.pageAccount .group.presetFilterButtons .filterBtns .filterPresets .select-filter-preset`,
-  ).removeClass("active");
-
-  // make current filter presest button active
-  qsa(
-    `.pageAccount .group.presetFilterButtons .filterBtns .filterPresets .select-filter-preset[data-id="${id}"]`,
-  ).addClass("active");
-}
-
-function addFilterPresetToSnapshot(filter: ResultFilters): void {
-  const snapshot = DB.getSnapshot();
-  if (!snapshot) return;
-  DB.setSnapshot({
-    ...snapshot,
-    filterPresets: [...snapshot.filterPresets, structuredClone(filter)],
-  });
-}
-
-// callback function called by popup once user inputs name
-export async function createFilterPreset(
-  name: string,
-): Promise<number | undefined> {
-  showLoaderBar();
-  const result = await Ape.users.addResultFilterPreset({
-    body: { ...filters, name },
-  });
-  hideLoaderBar();
-  if (result.status === 200) {
-    addFilterPresetToSnapshot({ ...filters, name, _id: result.body.data });
-    void updateFilterPresets();
-    return 1;
-  } else {
-    console.log("error creating filter preset: " + result.body.message);
-    return 0;
-  }
-}
-
-function removeFilterPresetFromSnapshot(id: string): void {
-  const snapshot = DB.getSnapshot();
-  if (!snapshot) return;
-  const filterPresets = [...snapshot.filterPresets];
-  const toDeleteIx = filterPresets.findIndex((filter) => filter._id === id);
-
-  if (toDeleteIx > -1) {
-    filterPresets.splice(toDeleteIx, 1);
-  }
-  DB.setSnapshot({ ...snapshot, filterPresets });
-}
-
-// deletes the currently selected filter preset
-async function deleteFilterPreset(id: string): Promise<void> {
-  showLoaderBar();
-  const result = await Ape.users.removeResultFilterPreset({
-    params: { presetId: id },
-  });
-  hideLoaderBar();
-  if (result.status === 200) {
-    removeFilterPresetFromSnapshot(id);
-    void updateFilterPresets();
-    reset();
-    showSuccessNotification("Filter preset deleted");
-  } else {
-    showErrorNotification(
-      "Error deleting filter preset: " + result.body.message,
-    );
-    console.log("error deleting filter preset", result.body.message);
-  }
-}
-
-function deSelectFilterPreset(): void {
-  // make all filter preset buttons inactive
-  qsa(
-    ".pageAccount .group.presetFilterButtons .filterBtns .filterPresets .select-filter-preset",
-  ).removeClass("active");
-}
-
-function getFilters(): ResultFilters {
-  return filters;
-}
-
-function getGroup<G extends ResultFiltersGroup>(group: G): ResultFilters[G] {
-  return filters[group];
-}
-
-// export function setFilter(group, filter, value) {
-//   filters[group][filter] = value;
-// }
-
-export function getFilter<G extends ResultFiltersGroup>(
-  group: G,
-  filter: ResultFiltersGroupItem<G>,
-): ResultFilters[G][ResultFiltersGroupItem<G>] {
-  return filters[group][filter];
-}
-
-function setFilter<G extends ResultFiltersGroup>(
-  group: G,
-  filter: ResultFiltersGroupItem<G>,
-  value: boolean,
-): void {
-  filters[group][filter] = value as (typeof filters)[G][typeof filter];
-}
-
-function setAllFilters(group: ResultFiltersGroup, value: boolean): void {
-  Object.keys(getGroup(group)).forEach((filter) => {
-    filters[group][filter as keyof (typeof filters)[typeof group]] =
-      value as never;
-  });
-}
-
-export function loadTags(): void {
-  const snapshot = DB.getSnapshot();
-
-  if (snapshot === undefined) return;
-
-  snapshot.tags.forEach((tag) => {
-    defaultResultFilters.tags[tag._id] = true;
-  });
-}
-
-export function reset(): void {
-  filters = defaultResultFilters;
-  save();
-}
-
-type AboveChartDisplay = Partial<
-  Record<ResultFiltersGroup, { all: boolean; array?: string[] }>
->;
-
-export function updateActive(): void {
-  const aboveChartDisplay: AboveChartDisplay = {};
-
-  for (const group of Misc.typedKeys(getFilters())) {
-    // id and name field do not correspond to any ui elements, no need to update
-    if (group === "_id" || group === "name") {
-      continue;
-    }
-
-    aboveChartDisplay[group] = {
-      all: true,
-      array: [],
-    };
-
-    for (const filter of Misc.typedKeys(getGroup(group))) {
-      const groupAboveChartDisplay = aboveChartDisplay[group];
-
-      if (groupAboveChartDisplay === undefined) continue;
-
-      const filterValue = getFilter(
-        group,
-        filter as ResultFiltersGroupItem<typeof group>,
-      );
-      if (filterValue === true) {
-        groupAboveChartDisplay.array?.push(filter);
-      } else {
-        if (groupAboveChartDisplay.all !== undefined) {
-          groupAboveChartDisplay.all = false;
-        }
-      }
-
-      if (groupsUsingSelect.has(group)) {
-        const option = qs<HTMLOptionElement>(
-          `.pageAccount .group.filterButtons .filterGroup[group="${group}"] option[value="${filter}"]`,
-        );
-        if (filterValue === true) {
-          option?.setSelected(true);
-        } else {
-          option?.setSelected(false);
-        }
-      } else {
-        let buttonEl;
-        if (group === "date") {
-          buttonEl = qs(
-            `.pageAccount .group.topFilters .filterGroup[group="${group}"] button[filter="${filter}"]`,
-          );
-        } else {
-          buttonEl = qs(
-            `.pageAccount .group.filterButtons .filterGroup[group="${group}"] button[filter="${filter}"]`,
-          );
-        }
-        if (filterValue === true) {
-          buttonEl?.addClass("active");
-        } else {
-          buttonEl?.removeClass("active");
-        }
-      }
-    }
-  }
-
-  for (const [id, select] of Object.entries(groupSelects)) {
-    const ss = select;
-    const group = getGroup(id as ResultFiltersGroup);
-    const everythingSelected = Object.values(group).every((v) => v === true);
-
-    const newData = ss.store.getData();
-
-    const allOption = qs<HTMLOptionElement>(
-      `.pageAccount .group.filterButtons .filterGroup[group="${id}"] option[value="all"]`,
-    );
-
-    if (everythingSelected) {
-      allOption?.setSelected(true);
-      for (const data of newData) {
-        if ("value" in data) {
-          if (data.value === "all") data.selected = true;
-          else data.selected = false;
-        }
-      }
-      ss.store.setData(newData);
-      ss.render.renderValues();
-    } else {
-      allOption?.setSelected(false);
-    }
-
-    for (const data of newData) {
-      if ("value" in data) {
-        if (group[data.value as keyof typeof group] === true) {
-          data.selected = true;
-        } else {
-          if (!everythingSelected || data.value !== "all") {
-            data.selected = false;
-          }
-        }
-      }
-    }
-
-    setTimeout(() => {
-      ss.store.setData(newData);
-      if (!everythingSelected) {
-        ss.render.renderValues();
-      }
-      ss.render.renderOptions(newData);
-    }, 0);
-  }
-
-  function addText(group: ResultFiltersGroup): string {
-    let ret = "";
-    ret += "<div class='group'>";
-    if (group === "difficulty") {
-      ret += `<span aria-label="Difficulty" data-balloon-pos="up"><i class="fas fa-fw fa-star"></i>`;
-    } else if (group === "mode") {
-      ret += `<span aria-label="Mode" data-balloon-pos="up"><i class="fas fa-fw fa-bars"></i>`;
-    } else if (group === "punctuation") {
-      ret += `<span aria-label="Punctuation" data-balloon-pos="up"><i class="fas fa-fw fa-at"></i>`;
-    } else if (group === "numbers") {
-      ret += `<span aria-label="Numbers" data-balloon-pos="up"><i class="fas fa-fw fa-hashtag"></i>`;
-    } else if (group === "words") {
-      ret += `<span aria-label="Words" data-balloon-pos="up"><i class="fas fa-fw fa-font"></i>`;
-    } else if (group === "time") {
-      ret += `<span aria-label="Time" data-balloon-pos="up"><i class="fas fa-fw fa-clock"></i>`;
-    } else if (group === "date") {
-      ret += `<span aria-label="Date" data-balloon-pos="up"><i class="fas fa-fw fa-calendar"></i>`;
-    } else if (group === "tags") {
-      ret += `<span aria-label="Tags" data-balloon-pos="up"><i class="fas fa-fw fa-tags"></i>`;
-    } else if (group === "language") {
-      ret += `<span aria-label="Language" data-balloon-pos="up"><i class="fas fa-fw fa-globe-americas"></i>`;
-    } else if (group === "funbox") {
-      ret += `<span aria-label="Funbox" data-balloon-pos="up"><i class="fas fa-fw fa-gamepad"></i>`;
-    }
-    if (aboveChartDisplay[group]?.all) {
-      ret += "all";
-    } else {
-      if (group === "tags") {
-        ret += aboveChartDisplay.tags?.array
-          ?.map((id) => {
-            if (id === "none") return id;
-            const snapshot = DB.getSnapshot();
-            if (snapshot === undefined) return id;
-            const name = snapshot.tags?.find((t) => t._id === id);
-            if (name !== undefined) {
-              return snapshot.tags?.find((t) => t._id === id)?.display;
-            }
-            return name;
-          })
-          .join(", ");
-      } else {
-        ret += aboveChartDisplay[group]?.array?.join(", ").replace(/_/g, " ");
-      }
-    }
-    ret += "</span></div>";
-    return ret;
-  }
-
-  let chartString = "";
-
-  //date
-  chartString += addText("date");
-  chartString += `<div class="spacer"></div>`;
-
-  //mode
-  chartString += addText("mode");
-  chartString += `<div class="spacer"></div>`;
-
-  //time
-  if (aboveChartDisplay.mode?.array?.includes("time")) {
-    chartString += addText("time");
-    chartString += `<div class="spacer"></div>`;
-  }
-
-  //words
-  if (aboveChartDisplay.mode?.array?.includes("words")) {
-    chartString += addText("words");
-    chartString += `<div class="spacer"></div>`;
-  }
-
-  //diff
-  chartString += addText("difficulty");
-  chartString += `<div class="spacer"></div>`;
-
-  //punc
-  chartString += addText("punctuation");
-  chartString += `<div class="spacer"></div>`;
-
-  //numbers
-  chartString += addText("numbers");
-  chartString += `<div class="spacer"></div>`;
-
-  //language
-  chartString += addText("language");
-  chartString += `<div class="spacer"></div>`;
-
-  //funbox
-  chartString += addText("funbox");
-  chartString += `<div class="spacer"></div>`;
-
-  //tags
-  chartString += addText("tags");
-
-  qs(".pageAccount .group.chart .above")?.setHtml(chartString);
-}
-
-function toggle<G extends ResultFiltersGroup>(
-  group: G,
-  filter: ResultFiltersGroupItem<G>,
-): void {
-  // user is changing the filters -> current filter is no longer a filter preset
-  deSelectFilterPreset();
-
-  try {
-    if (group === "date") {
-      setAllFilters("date", false);
-    }
-    const currentValue = filters[group][filter] as unknown as boolean;
-    const newValue = !currentValue;
-    filters[group][filter] =
-      newValue as ResultFilters[G][ResultFiltersGroupItem<G>];
-    save();
-  } catch (e) {
-    showNoticeNotification(
-      "Something went wrong toggling filter. Reverting to defaults.",
-    );
-    console.log("toggling filter error");
-    console.error(e);
-    reset();
-    updateActive();
-  }
-}
-
-for (const el of qsa(`
-  .pageAccount .filterButtons .buttonsAndTitle .buttons,
-  .pageAccount .group.topFilters .buttonsAndTitle.testDate .buttons
-  `)) {
-  el.onChild("click", "button", (e) => {
-    const childTarget = e.childTarget as HTMLElement;
-
-    if (childTarget.classList.contains("allFilters")) {
-      Misc.typedKeys(getFilters()).forEach((group) => {
-        // id and name field do not correspond to any ui elements, no need to update
-        if (group === "_id" || group === "name") {
-          return;
-        }
-
-        setAllFilters(group, true);
-      });
-      setAllFilters("date", false);
-      filters.date.all = true;
-    } else if (childTarget.classList.contains("noFilters")) {
-      Misc.typedKeys(getFilters()).forEach((group) => {
-        // id and name field do not correspond to any ui elements, no need to update
-        if (group === "_id" || group === "name") {
-          return;
-        }
-
-        if (group !== "date") {
-          setAllFilters(group, false);
-        }
-      });
-    } else {
-      const group = (e.target as HTMLElement).parentElement?.getAttribute(
-        "group",
-      ) as ResultFiltersGroup | null;
-      if (group === null) {
-        throw new Error("Cannot find group of target.");
-      }
-
-      const filter = childTarget.getAttribute(
-        "filter",
-      ) as ResultFiltersGroupItem<typeof group> | null;
-      if (filter === null) {
-        throw new Error("Cannot find filter of target.");
-      }
-
-      if ((e.target as HTMLElement).tagName === "BUTTON") {
-        if (e.shiftKey) {
-          setAllFilters(group, false);
-          filters[group][filter] =
-            true as ResultFilters[typeof group][typeof filter];
-        } else {
-          toggle(group, filter);
-          // filters[group][filter] = !filters[group][filter];
-        }
-      }
-    }
-    updateActive();
-    save();
-  });
-}
-
-qs(".pageAccount .topFilters button.allFilters")?.on("click", () => {
-  // user is changing the filters -> current filter is no longer a filter preset
-  deSelectFilterPreset();
-
-  console.log(getFilters());
-
-  Misc.typedKeys(getFilters()).forEach((group) => {
-    // id and name field do not correspond to any ui elements, no need to update
-    if (group === "_id" || group === "name") {
-      return;
-    }
-
-    setAllFilters(group, true);
-  });
-  setAllFilters("date", false);
-  filters.date.all = true;
-  updateActive();
-  save();
-});
-
-qs(".pageAccount .topFilters button.currentConfigFilter")?.on("click", () => {
-  // user is changing the filters -> current filter is no longer a filter preset
-  deSelectFilterPreset();
-
-  Misc.typedKeys(getFilters()).forEach((group) => {
-    // id and name field do not correspond to any ui elements, no need to update
-    if (group === "_id" || group === "name") {
-      return;
-    }
-
-    setAllFilters(group, false);
-  });
-
-  filters.pb.no = true;
-  filters.pb.yes = true;
-
-  filters.difficulty[Config.difficulty] = true;
-  filters.mode[Config.mode] = true;
-  if (Config.mode === "time") {
-    if ([15, 30, 60, 120].includes(Config.time)) {
-      const configTime = `${Config.time}` as keyof typeof filters.time;
-      filters.time[configTime] = true;
-    } else {
-      filters.time.custom = true;
-    }
-  } else if (Config.mode === "words") {
-    if ([10, 25, 50, 100, 200].includes(Config.words)) {
-      const configWords = `${Config.words}` as keyof typeof filters.words;
-      filters.words[configWords] = true;
-    } else {
-      filters.words.custom = true;
-    }
-  } else if (Config.mode === "quote") {
-    const filterName: ResultFiltersGroupItem<"quoteLength">[] = [
-      "short",
-      "medium",
-      "long",
-      "thicc",
-    ];
-    filterName.forEach((ql, index) => {
-      if (Config.quoteLength.includes(index as QuoteLength)) {
-        filters.quoteLength[ql] = true;
-      } else {
-        filters.quoteLength[ql] = false;
-      }
-    });
-  }
-  if (Config.punctuation) {
-    filters.punctuation.on = true;
-  } else {
-    filters.punctuation.off = true;
-  }
-  if (Config.numbers) {
-    filters.numbers.on = true;
-  } else {
-    filters.numbers.off = true;
-  }
-  if (Config.mode === "quote" && /english.*/.test(Config.language)) {
-    filters.language["english"] = true;
-  } else {
-    filters.language[Config.language] = true;
-  }
-
-  if (Config.funbox.length === 0) {
-    filters.funbox["none"] = true;
-  } else {
-    for (const f of Config.funbox) {
-      filters.funbox[f] = true;
-    }
-  }
-
-  filters.tags["none"] = true;
-
-  DB.getSnapshot()?.tags?.forEach((tag) => {
-    if (tag.active === true) {
-      filters.tags["none"] = false;
-      filters.tags[tag._id] = true;
-    }
-  });
-
-  filters.date.all = true;
-  updateActive();
-  save();
-});
-
-qs(".pageAccount .topFilters button.toggleAdvancedFilters")?.on("click", () => {
-  const buttons = qs(".pageAccount .filterButtons");
-  const advancedFiltersButton = qs(
-    ".pageAccount .topFilters button.toggleAdvancedFilters",
-  );
-
-  if (buttons?.isVisible()) {
-    void buttons.slideUp(250);
-    advancedFiltersButton?.removeClass("active");
-  } else {
-    void buttons?.slideDown(250);
-    advancedFiltersButton?.addClass("active");
-  }
-});
-
-function adjustScrollposition(
-  group: ResultFiltersGroup,
-  topItem: number = 0,
-): void {
-  const slimSelect = groupSelects[group];
-  if (slimSelect === undefined) return;
-  const listElement = slimSelect.render.content.list;
-  const topListItem = listElement.children.item(topItem) as HTMLElement;
-
-  listElement.scrollTop = topListItem.offsetTop - listElement.offsetTop;
-}
-
-function selectBeforeChangeFn(
-  group: ResultFiltersGroup,
-  selectedOptions: Option[],
-  oldSelectedOptions: Option[],
-): boolean {
-  const includesAllNow = selectedOptions.some(
-    (option) => option.value === "all",
-  );
-  const includedAllBefore = oldSelectedOptions.some(
-    (option) => option.value === "all",
-  );
-
-  if (includesAllNow) {
-    if (!includedAllBefore) {
-      // all option was selected
-      selectedOptions = selectedOptions.filter(
-        (option) => option.value === "all",
-      );
-    } else if (selectedOptions.length < oldSelectedOptions.length) {
-      // options other than all were deselcted
-      selectedOptions = selectedOptions.filter(
-        (option) => option.value !== "all",
-      );
-    }
-  } else {
-    if (includedAllBefore) {
-      // all option was deselected
-      selectedOptions = [];
-    }
-  }
-
-  setAllFilters(group, false);
-  for (const selectedOption of selectedOptions) {
-    if (selectedOption.value === "all") {
-      setAllFilters(group, true);
-      break;
-    }
-
-    setFilter(
-      group,
-      selectedOption.value as ResultFiltersGroupItem<typeof group>,
-      true,
-    );
-  }
-
-  updateActive();
-  save();
-  selectChangeCallbackFn();
-  return false;
-}
-
-let selectChangeCallbackFn: () => void = () => {
-  //
-};
-
-export function updateTagsDropdownOptions(): void {
-  const snapshot = DB.getSnapshot();
-
-  if (snapshot === undefined) {
-    return;
-  }
-
-  const newTags = snapshot.tags.filter(
-    (it) => defaultResultFilters.tags[it._id] === undefined,
-  );
-  if (newTags.length > 0) {
-    const everythingSelected = Object.values(filters.tags).every((v) => v);
-
-    defaultResultFilters.tags = {
-      ...defaultResultFilters.tags,
-      ...Object.fromEntries(newTags.map((tag) => [tag._id, true])),
-    };
-
-    filters.tags = {
-      ...filters.tags,
-      ...Object.fromEntries(
-        newTags.map((tag) => [tag._id, everythingSelected]),
-      ),
-    };
-  }
-
-  const el = document.querySelector<HTMLElement>(
-    ".pageAccount .content .filterButtons .buttonsAndTitle.tags .select select",
-  );
-
-  if (!(el instanceof HTMLElement)) return;
-
-  let html = "";
-
-  html += "<option value='all'>all</option>";
-  html += "<option value='none'>no tag</option>";
-
-  for (const tag of snapshot.tags) {
-    html += `<option value="${tag._id}" filter="${tag.name}">${tag.display}</option>`;
-  }
-
-  el.innerHTML = html;
-}
-
-let buttonsAppended = false;
-
-export async function appendDropdowns(
-  selectChangeCallback: () => void,
-): Promise<void> {
-  //snapshot at this point is guaranteed to exist
-  const snapshot = DB.getSnapshot() as Snapshot;
-
-  tagDropdownUpdate(snapshot);
-
-  if (buttonsAppended) return;
-
-  selectChangeCallbackFn = selectChangeCallback;
-
-  groupSelects["language"] = new SlimSelect({
-    select:
-      ".pageAccount .content .filterButtons .buttonsAndTitle.languages .select .languageSelect",
-    data: [
-      { value: "all", text: "all" },
-      ...LanguageList.map((language) => ({
-        value: language,
-        text: Strings.getLanguageDisplayString(language),
-        filter: language,
-      })),
-    ],
-    settings: {
-      showSearch: true,
-      placeholderText: "select a language",
-      allowDeselect: true,
-      closeOnSelect: false,
-    },
-    events: {
-      beforeChange: (selectedOptions, oldSelectedOptions): boolean => {
-        return selectBeforeChangeFn(
-          "language",
-          selectedOptions,
-          oldSelectedOptions,
-        );
-      },
-      beforeOpen: (): void => {
-        adjustScrollposition("language");
-      },
-    },
-  });
-
-  groupSelects["funbox"] = new SlimSelect({
-    select:
-      ".pageAccount .content .filterButtons .buttonsAndTitle.funbox .select .funboxSelect",
-    data: [
-      { value: "all", text: "all" },
-      { value: "none", text: "no funbox" },
-      ...getAllFunboxes().map((funbox) => ({
-        value: funbox.name,
-        text: funbox.name.replace(/_/g, " "),
-        filter: funbox.name,
-      })),
-    ],
-    settings: {
-      showSearch: true,
-      placeholderText: "select a funbox",
-      allowDeselect: true,
-      closeOnSelect: false,
-    },
-    events: {
-      beforeChange: (selectedOptions, oldSelectedOptions): boolean => {
-        return selectBeforeChangeFn(
-          "funbox",
-          selectedOptions,
-          oldSelectedOptions,
-        );
-      },
-      beforeOpen: (): void => {
-        adjustScrollposition("funbox");
-      },
-    },
-  });
-
-  void updateFilterPresets();
-  buttonsAppended = true;
-}
-
-function tagDropdownUpdate(snapshot: Snapshot): void {
-  const tagsSection = qs(
-    ".pageAccount .content .filterButtons .buttonsAndTitle.tags",
-  );
-
-  if (snapshot.tags.length === 0) {
-    tagsSection?.hide();
-    if (groupSelects["tags"]) {
-      groupSelects["tags"].destroy();
-      delete groupSelects["tags"];
-    }
-    setFilter("tags", "none", true);
-  } else {
-    tagsSection?.show();
-
-    updateTagsDropdownOptions();
-
-    // Only create SlimSelect if it doesn't exist yet
-    if (!groupSelects["tags"]) {
-      const selectEl = document.querySelector(
-        ".pageAccount .content .filterButtons .buttonsAndTitle.tags .select .tagsSelect",
-      );
-
-      if (selectEl) {
-        groupSelects["tags"] = new SlimSelect({
-          select: selectEl,
-          settings: {
-            showSearch: true,
-            placeholderText: "select a tag",
-            allowDeselect: true,
-            closeOnSelect: false,
-          },
-          events: {
-            beforeChange: (selectedOptions, oldSelectedOptions): boolean => {
-              return selectBeforeChangeFn(
-                "tags",
-                selectedOptions,
-                oldSelectedOptions,
-              );
-            },
-            beforeOpen: (): void => {
-              adjustScrollposition("tags");
-            },
-          },
-        });
-      }
-    }
-  }
-}
-
-for (const el of qsa(".group.presetFilterButtons .filterBtns")) {
-  el.onChild("click", ".filterPresets .delete-filter-preset", (e) => {
-    void deleteFilterPreset(
-      (e.childTarget as HTMLElement).dataset["id"] as string,
-    );
-  });
-}
-
-function verifyResultFiltersStructure(filterIn: ResultFilters): ResultFilters {
-  const filter = mergeWithDefaultFilters(
-    sanitize(ResultFiltersSchema.partial().strip(), structuredClone(filterIn)),
-  );
-
-  return filter;
-}
-
-authEvent.subscribe((event) => {
-  if (event.type === "snapshotUpdated" && event.data.isInitial) {
-    loadTags();
-    void load();
-  }
-});
diff --git a/frontend/src/ts/elements/last-10-average.ts b/frontend/src/ts/elements/last-10-average.ts
index df296a69afdd..a40c92ce8919 100644
--- a/frontend/src/ts/elements/last-10-average.ts
+++ b/frontend/src/ts/elements/last-10-average.ts
@@ -1,8 +1,8 @@
-import * as DB from "../db";
 import * as Misc from "../utils/misc";
 import * as Numbers from "@monkeytype/util/numbers";
 import { Config } from "../config/store";
 import * as TestWords from "../test/test-words";
+import { getUserAverage10 } from "../collections/results";
 
 let averageWPM = 0;
 let averageAcc = 0;
@@ -10,17 +10,9 @@ let averageAcc = 0;
 export async function update(): Promise<void> {
   const mode2 = Misc.getMode2(Config, TestWords.currentQuote);
 
-  const [wpm, acc] = (
-    await DB.getUserAverage10(
-      Config.mode,
-      mode2 as never,
-      Config.punctuation,
-      Config.numbers,
-      Config.language,
-      Config.difficulty,
-      Config.lazyMode,
-    )
-  ).map(Numbers.roundTo2) as [number, number];
+  const average = await getUserAverage10({ ...Config, mode2 });
+  const wpm = Numbers.roundTo2(average.wpm);
+  const acc = Numbers.roundTo2(average.acc);
 
   averageWPM = Config.alwaysShowDecimalPlaces ? wpm : Math.round(wpm);
   averageAcc = Config.alwaysShowDecimalPlaces ? acc : Math.floor(acc);
diff --git a/frontend/src/ts/elements/modes-notice.ts b/frontend/src/ts/elements/modes-notice.ts
index eda13c5988d0..46fa977b7531 100644
--- a/frontend/src/ts/elements/modes-notice.ts
+++ b/frontend/src/ts/elements/modes-notice.ts
@@ -2,6 +2,7 @@ import * as PaceCaret from "../test/pace-caret";
 import * as TestState from "../test/test-state";
 import * as DB from "../db";
 import * as Last10Average from "../elements/last-10-average";
+import { __nonReactive } from "../collections/tags";
 import { Config } from "../config/store";
 import * as TestWords from "../test/test-words";
 import { configEvent, type ConfigEventKey } from "../events/config";
@@ -302,10 +303,8 @@ export async function update(): Promise<void> {
 
   let tagsString = "";
   try {
-    DB.getSnapshot()?.tags?.forEach((tag) => {
-      if (tag.active === true) {
-        tagsString += tag.display + ", ";
-      }
+    __nonReactive.getActiveTags().forEach((tag) => {
+      tagsString += tag.name + ", ";
     });
 
     if (tagsString !== "") {
diff --git a/frontend/src/ts/elements/result-batches.ts b/frontend/src/ts/elements/result-batches.ts
index 9f7395d70695..2af9d3691874 100644
--- a/frontend/src/ts/elements/result-batches.ts
+++ b/frontend/src/ts/elements/result-batches.ts
@@ -5,6 +5,7 @@ import { mapRange } from "@monkeytype/util/numbers";
 import { getTheme } from "../states/theme";
 import { qs } from "../utils/dom";
 
+//TODO
 export function hide(): void {
   qs(".pageAccount .resultBatches")?.hide();
 }
@@ -14,7 +15,8 @@ export function show(): void {
 }
 
 export async function update(): Promise<void> {
-  const results = DB.getSnapshot()?.results;
+  //TODO fix or delete?
+  const results: string[] | undefined = [];
 
   if (results === undefined) {
     console.error(
diff --git a/frontend/src/ts/elements/simple-modal.ts b/frontend/src/ts/elements/simple-modal.ts
index 620afd3ec5d2..552b174d9dca 100644
--- a/frontend/src/ts/elements/simple-modal.ts
+++ b/frontend/src/ts/elements/simple-modal.ts
@@ -143,6 +143,7 @@ export class SimpleModal {
   hideCallsExec: boolean;
   showLabels: boolean;
   afterClickAway: (() => void) | undefined;
+  context?: unknown;
   constructor(options: SimpleModalOptions) {
     this.parameters = [];
     this.id = options.id;
@@ -416,9 +417,13 @@ export class SimpleModal {
     simpleModalEl.qsa(".checkbox").removeClass("disabled");
   }
 
-  show(parameters: string[] = [], showOptions: ShowOptions): void {
+  show(
+    parameters: string[] = [],
+    showOptions: ShowOptions & { context?: unknown },
+  ): void {
     activePopup = this;
     this.parameters = parameters;
+    this.context = showOptions.context;
     void modal.show({
       focusFirstInput: true,
       ...showOptions,
diff --git a/frontend/src/ts/event-handlers/account.ts b/frontend/src/ts/event-handlers/account.ts
deleted file mode 100644
index e75072fae276..000000000000
--- a/frontend/src/ts/event-handlers/account.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import * as PbTablesModal from "../modals/pb-tables";
-import * as EditProfileModal from "../modals/edit-profile";
-import { getSnapshot } from "../db";
-import { isAuthenticated } from "../states/core";
-import {
-  showNoticeNotification,
-  showErrorNotification,
-} from "../states/notifications";
-import * as EditResultTagsModal from "../modals/edit-result-tags";
-import * as AddFilterPresetModal from "../modals/new-filter-preset";
-import { parseWithSchema as parseJsonWithSchema } from "@monkeytype/util/json";
-import { z } from "zod";
-import { qs } from "../utils/dom";
-
-const accountPage = qs("#pageAccount");
-
-accountPage?.onChild("click", ".pbsTime .showAllButton", () => {
-  PbTablesModal.show("time");
-});
-
-accountPage?.onChild("click", ".pbsWords .showAllButton", () => {
-  PbTablesModal.show("words");
-});
-
-accountPage?.onChild("click", ".editProfileButton", () => {
-  if (!isAuthenticated()) {
-    showNoticeNotification("You must be logged in to edit your profile");
-    return;
-  }
-  const snapshot = getSnapshot();
-  if (!snapshot) {
-    showErrorNotification(
-      "Failed to open edit profile modal: No user snapshot found",
-    );
-    return;
-  }
-  if (snapshot.banned === true) {
-    showNoticeNotification("Banned users cannot edit their profile");
-    return;
-  }
-  EditProfileModal.show();
-});
-
-const TagsArraySchema = z.array(z.string());
-
-accountPage?.onChild("click", ".group.history .resultEditTagsButton", (e) => {
-  const targetButton = e.childTarget as HTMLElement;
-  const resultid = targetButton?.getAttribute("data-result-id");
-  const tags = targetButton?.getAttribute("data-tags");
-
-  EditResultTagsModal.show(
-    resultid ?? "",
-    parseJsonWithSchema(tags ?? "[]", TagsArraySchema),
-    "accountPage",
-  );
-});
-
-accountPage?.qs("button.createFilterPresetBtn")?.on("click", () => {
-  AddFilterPresetModal.show();
-});
diff --git a/frontend/src/ts/event-handlers/settings.ts b/frontend/src/ts/event-handlers/settings.ts
index bd2d6416d0b5..e893fe8a1e22 100644
--- a/frontend/src/ts/event-handlers/settings.ts
+++ b/frontend/src/ts/event-handlers/settings.ts
@@ -65,54 +65,24 @@ settingsPage?.qs(".section.tags")?.on("click", (e) => {
     EditTagPopup.show("add");
   } else if (target.classList.contains("editButton")) {
     const tagid = target.parentElement?.getAttribute("data-id");
-    const name = target.parentElement?.getAttribute("data-display");
-    if (
-      tagid === undefined ||
-      name === undefined ||
-      tagid === "" ||
-      name === "" ||
-      tagid === null ||
-      name === null
-    ) {
-      showErrorNotification(
-        "Failed to edit tag: Could not find tag id or name",
-      );
+    if (tagid === undefined || tagid === "" || tagid === null) {
+      showErrorNotification("Failed to edit tag: Could not find tag id");
       return;
     }
-    EditTagPopup.show("edit", tagid, name);
+    EditTagPopup.show("edit", tagid);
   } else if (target.classList.contains("clearPbButton")) {
     const tagid = target.parentElement?.getAttribute("data-id");
-    const name = target.parentElement?.getAttribute("data-display");
-    if (
-      tagid === undefined ||
-      name === undefined ||
-      tagid === "" ||
-      name === "" ||
-      tagid === null ||
-      name === null
-    ) {
-      showErrorNotification(
-        "Failed to clear tag PB: Could not find tag id or name",
-      );
+    if (tagid === undefined || tagid === "" || tagid === null) {
+      showErrorNotification("Failed to clear tag PB: Could not find tag id");
       return;
     }
-    EditTagPopup.show("clearPb", tagid, name);
+    EditTagPopup.show("clearPb", tagid);
   } else if (target.classList.contains("removeButton")) {
     const tagid = target.parentElement?.getAttribute("data-id");
-    const name = target.parentElement?.getAttribute("data-display");
-    if (
-      tagid === undefined ||
-      name === undefined ||
-      tagid === "" ||
-      name === "" ||
-      tagid === null ||
-      name === null
-    ) {
-      showErrorNotification(
-        "Failed to remove tag: Could not find tag id or name",
-      );
+    if (tagid === undefined || tagid === "" || tagid === null) {
+      showErrorNotification("Failed to remove tag: Could not find tag id");
       return;
     }
-    EditTagPopup.show("remove", tagid, name);
+    EditTagPopup.show("remove", tagid);
   }
 });
diff --git a/frontend/src/ts/event-handlers/test.ts b/frontend/src/ts/event-handlers/test.ts
index a55218f6ab3a..78746fc0a4bc 100644
--- a/frontend/src/ts/event-handlers/test.ts
+++ b/frontend/src/ts/event-handlers/test.ts
@@ -1,7 +1,7 @@
 import * as Commandline from "../commandline/commandline";
 import { Config } from "../config/store";
-import * as DB from "../db";
 import * as EditResultTagsModal from "../modals/edit-result-tags";
+import { __nonReactive } from "../collections/tags";
 import * as TestWords from "../test/test-words";
 import {
   showNoticeNotification,
@@ -33,7 +33,7 @@ testPage?.onChild("click", "#testModesNotice .textButton", async (event) => {
 });
 
 testPage?.onChild("click", ".tags .editTagsButton", () => {
-  if ((DB.getSnapshot()?.tags?.length ?? 0) > 0) {
+  if (__nonReactive.getTags().length > 0) {
     const resultid =
       qs(".pageTest .tags .editTagsButton")?.getAttribute("data-result-id") ??
       "";
diff --git a/frontend/src/ts/firebase.ts b/frontend/src/ts/firebase.ts
index bc6f08eb86cd..61a4c4a6bc92 100644
--- a/frontend/src/ts/firebase.ts
+++ b/frontend/src/ts/firebase.ts
@@ -33,7 +33,7 @@ import {
 import { tryCatch } from "@monkeytype/util/trycatch";
 import { googleSignUpEvent } from "./events/google-sign-up";
 import { addBanner } from "./states/banners";
-import { setUserId } from "./states/core";
+import { setUserId, setUserVerified } from "./states/core";
 
 let app: FirebaseApp | undefined;
 let Auth: AuthType | undefined;
@@ -69,7 +69,7 @@ export async function init(callback: ReadyCallback): Promise<void> {
 
     onAuthStateChanged(Auth, async (user) => {
       if (!ignoreAuthCallback) {
-        setUserId(user?.uid ?? null);
+        setUserState(user);
         await callback(true, user);
       }
     });
@@ -78,7 +78,7 @@ export async function init(callback: ReadyCallback): Promise<void> {
     Auth = undefined;
     console.error("Firebase failed to initialize", e);
     await callback(false, null);
-    setUserId(null);
+    setUserState(null);
     if (isDevEnvironment()) {
       addBanner({
         level: "notice",
@@ -134,6 +134,21 @@ export async function signInWithEmailAndPassword(
   return result;
 }
 
+function setUserState(
+  options: {
+    uid: string;
+    emailVerified: boolean;
+  } | null,
+): void {
+  if (options === null) {
+    setUserId(null);
+    setUserVerified(false);
+  } else {
+    setUserId(options.uid);
+    setUserVerified(options.emailVerified);
+  }
+}
+
 export async function signInWithPopup(
   provider: AuthProvider,
   rememberMe: boolean,
@@ -151,11 +166,11 @@ export async function signInWithPopup(
     throw translateFirebaseError(error, "Failed to sign in with popup");
   }
   const additionalUserInfo = getAdditionalUserInfo(signedInUser);
+  setUserState(signedInUser.user);
   if (additionalUserInfo?.isNewUser) {
     googleSignUpEvent.dispatch({ signedInUser, isNewUser: true });
   } else {
     ignoreAuthCallback = false;
-    setUserId(signedInUser.user.uid);
     await readyCallback?.(true, signedInUser.user);
   }
 }
diff --git a/frontend/src/ts/index.ts b/frontend/src/ts/index.ts
index 7cc56fdd05f4..04505a49e169 100644
--- a/frontend/src/ts/index.ts
+++ b/frontend/src/ts/index.ts
@@ -8,7 +8,6 @@ import "./event-handlers/global";
 import "./event-handlers/keymap";
 import "./event-handlers/test";
 import "./event-handlers/settings";
-import "./event-handlers/account";
 import "./modals/google-sign-up";
 
 import { init } from "./firebase";
@@ -29,7 +28,6 @@ import "./modals/simple-modals";
 import * as CookiesModal from "./modals/cookies";
 import "./input/listeners";
 import "./controllers/route-controller";
-import * as Account from "./pages/account";
 import "./elements/no-css";
 import { egVideoListener } from "./popups/video-ad-popup";
 import "./legacy-states/connection";
@@ -91,7 +89,6 @@ void init(onAuthStateChanged).then(() => {
 addToGlobal({
   snapshot: DB.getSnapshot,
   config: Config,
-  toggleFilterDebug: Account.toggleFilterDebug,
   glarsesMode: enable,
   stats: TestStats.getStats,
   replay: Replay.getReplayExport,
diff --git a/frontend/src/ts/modals/edit-preset.ts b/frontend/src/ts/modals/edit-preset.ts
index 6b4d3f6e54d7..240bcfa6b6f7 100644
--- a/frontend/src/ts/modals/edit-preset.ts
+++ b/frontend/src/ts/modals/edit-preset.ts
@@ -1,5 +1,6 @@
 import Ape from "../ape";
 import * as DB from "../db";
+import { __nonReactive } from "../collections/tags";
 import { showLoaderBar, hideLoaderBar } from "../states/loader-bar";
 import * as Settings from "../pages/settings";
 import {
@@ -397,10 +398,8 @@ function getConfigChanges(): Partial<ConfigType> {
     state.presetType === "partial"
       ? getPartialConfigChanges(getConfigChangesFromConfig())
       : getConfigChangesFromConfig();
-  const tags = DB.getSnapshot()?.tags ?? [];
-
-  const activeTagIds: string[] = tags
-    .filter((tag) => tag.active)
+  const activeTagIds: string[] = __nonReactive
+    .getActiveTags()
     .map((tag) => tag._id);
 
   const setTags: boolean =
diff --git a/frontend/src/ts/modals/edit-result-tags.ts b/frontend/src/ts/modals/edit-result-tags.ts
index 2a844bb4b43d..a92b144c65c5 100644
--- a/frontend/src/ts/modals/edit-result-tags.ts
+++ b/frontend/src/ts/modals/edit-result-tags.ts
@@ -1,15 +1,14 @@
-import Ape from "../ape";
-import * as DB from "../db";
-
 import { showLoaderBar, hideLoaderBar } from "../states/loader-bar";
 import {
   showErrorNotification,
   showSuccessNotification,
 } from "../states/notifications";
-import * as AccountPage from "../pages/account";
 import { areUnsortedArraysEqual } from "../utils/arrays";
 import * as TestResult from "../test/result";
 import AnimatedModal from "../utils/animated-modal";
+import { __nonReactive } from "../collections/tags";
+import { updateTags } from "../collections/results";
+import { createErrorMessage } from "../utils/error";
 
 type State = {
   resultId: string;
@@ -37,6 +36,9 @@ export function show(
     return;
   }
 
+  const knownTagIds = new Set(__nonReactive.getTags().map((it) => it._id));
+  tags = tags.filter((it) => knownTagIds.has(it));
+
   state.resultId = resultId;
   state.startingTags = [...tags];
   state.tags = [...tags];
@@ -65,17 +67,17 @@ function appendButtons(): void {
   }
 
   const tagIds = new Set([
-    ...(DB.getSnapshot()?.tags.map((tag) => tag._id) ?? []),
+    ...__nonReactive.getTags().map((tag) => tag._id),
     ...state.tags,
   ]);
 
   buttonsEl.empty();
   for (const tagId of tagIds) {
-    const tag = DB.getSnapshot()?.tags.find((tag) => tag._id === tagId);
+    const tag = __nonReactive.getTag(tagId);
     const button = document.createElement("button");
     button.classList.add("toggleTag");
     button.setAttribute("data-tag-id", tagId);
-    button.innerHTML = tag?.display ?? "unknown tag";
+    button.textContent = tag?.name ?? tag?._id ?? "unknown tag"; //this shouldnt happen?
     button.addEventListener("click", (e) => {
       toggleTag(tagId);
       updateActiveButtons();
@@ -106,53 +108,30 @@ function toggleTag(tagId: string): void {
 
 async function save(): Promise<void> {
   showLoaderBar();
-  const response = await Ape.results.updateTags({
-    body: { resultId: state.resultId, tagIds: state.tags },
-  });
-  hideLoaderBar();
+  try {
+    await updateTags({
+      resultId: state.resultId,
+      currentTagIds: state.startingTags,
+      newTagIds: state.tags,
+      afterUpdate: ({ tagPbs }) => {
+        if (state.source === "resultPage") {
+          TestResult.updateTagsAfterEdit(state.tags, tagPbs);
+        }
+      },
+    });
+    hideLoaderBar();
+  } catch (e) {
+    hideLoaderBar();
+    const message = createErrorMessage(e, "Failed to update tags");
+    showErrorNotification(message);
+    return;
+  }
 
   //if got no freaking idea why this is needed
   //but update tags somehow adds undefined to the end of the array
   //i tried spreading, json parsing - nothing helped.
   state.tags = state.tags.filter((el) => el !== undefined);
-
-  if (response.status !== 200) {
-    showErrorNotification("Failed to update result tags", { response });
-    return;
-  }
-
-  //can do this because the response will not be null if the status is 200
-  const responseTagPbs = response.body.data?.tagPbs ?? [];
-
   showSuccessNotification("Tags updated", { durationMs: 2000 });
-
-  DB.getSnapshot()?.results?.forEach((result) => {
-    if (result._id === state.resultId) {
-      const tagsToUpdate = [
-        ...result.tags.filter((tag) => !state.tags.includes(tag)),
-        ...state.tags.filter((tag) => !result.tags.includes(tag)),
-      ];
-      result.tags = state.tags;
-      tagsToUpdate.forEach((tag) => {
-        void DB.updateLocalTagPB(
-          tag,
-          result.mode,
-          result.mode2,
-          result.punctuation,
-          result.numbers,
-          result.language,
-          result.difficulty,
-          result.lazyMode,
-        );
-      });
-    }
-  });
-
-  if (state.source === "accountPage") {
-    AccountPage.updateTagsForResult(state.resultId, state.tags);
-  } else if (state.source === "resultPage") {
-    TestResult.updateTagsAfterEdit(state.tags, responseTagPbs);
-  }
 }
 
 const modal = new AnimatedModal({
diff --git a/frontend/src/ts/modals/edit-tag.ts b/frontend/src/ts/modals/edit-tag.ts
index d42507fd7d76..991997dff4dd 100644
--- a/frontend/src/ts/modals/edit-tag.ts
+++ b/frontend/src/ts/modals/edit-tag.ts
@@ -1,15 +1,20 @@
-import Ape from "../ape";
-import * as DB from "../db";
 import * as Settings from "../pages/settings";
 import AnimatedModal, { ShowOptions } from "../utils/animated-modal";
 import { SimpleModal, TextInput } from "../elements/simple-modal";
 import { TagNameSchema } from "@monkeytype/schemas/users";
-import { SnapshotUserTag } from "../constants/default-snapshot";
 import { IsValidResponse } from "../types/validation";
+import {
+  insertTag,
+  deleteTag,
+  updateTagName,
+  clearTagPBs,
+  __nonReactive,
+} from "../collections/tags";
 import { normalizeName } from "../utils/strings";
+import { deleteLocalTag } from "../collections/results";
 
-function getTagFromSnapshot(tagId: string): SnapshotUserTag | undefined {
-  return DB.getSnapshot()?.tags.find((tag) => tag._id === tagId);
+function errorMessage(e: unknown): string {
+  return e instanceof Error ? e.message : String(e);
 }
 
 const tagNameValidation = async (tagName: string): Promise<IsValidResponse> => {
@@ -33,32 +38,18 @@ const actionModals: Record<Action, SimpleModal> = {
     buttonText: "add",
     execFn: async (_thisPopup, propTagName) => {
       const tagName = TagNameSchema.parse(normalizeName(propTagName));
-      const response = await Ape.users.createTag({ body: { tagName } });
 
-      if (response.status !== 200) {
+      try {
+        //todo: do we await? if we do, optimistic updates are kinda pointless?
+        await insertTag({ name: tagName });
+      } catch (e) {
         return {
           status: "error",
-          message:
-            "Failed to add tag: " +
-            response.body.message.replace(tagName, propTagName),
-          notificationOptions: { response },
+          message: "Failed to add tag: " + errorMessage(e),
         };
       }
 
-      DB.getSnapshot()?.tags?.push({
-        display: tagName.replace(/_/g, " "),
-        name: tagName,
-        _id: response.body.data._id,
-        personalBests: {
-          time: {},
-          words: {},
-          quote: {},
-          zen: {},
-          custom: {},
-        },
-      });
       void Settings.update();
-
       return { status: "success", message: `Tag added` };
     },
   }),
@@ -74,31 +65,22 @@ const actionModals: Record<Action, SimpleModal> = {
     ],
     buttonText: "save",
     beforeInitFn: (_thisPopup) => {
-      (_thisPopup.inputs[0] as TextInput).initVal = _thisPopup.parameters[0];
+      const tag = __nonReactive.getTag(_thisPopup.parameters[0] as string);
+      (_thisPopup.inputs[0] as TextInput).initVal = tag?.name ?? "";
     },
     execFn: async (_thisPopup, propTagName) => {
       const tagName = TagNameSchema.parse(normalizeName(propTagName));
-      const tagId = _thisPopup.parameters[1] as string;
-
-      const response = await Ape.users.editTag({
-        body: { tagId, newName: tagName },
-      });
+      const tagId = _thisPopup.parameters[0] as string;
 
-      if (response.status !== 200) {
+      try {
+        await updateTagName({ tagId, newName: tagName });
+      } catch (e) {
         return {
           status: "error",
-          message: "Failed to edit tag",
-          notificationOptions: { response },
+          message: "Failed to update tag: " + errorMessage(e),
         };
       }
 
-      const matchingTag = getTagFromSnapshot(tagId);
-
-      if (matchingTag !== undefined) {
-        matchingTag.name = tagName;
-        matchingTag.display = tagName.replace(/_/g, " ");
-      }
-
       void Settings.update();
 
       return { status: "success", message: `Tag updated` };
@@ -109,27 +91,22 @@ const actionModals: Record<Action, SimpleModal> = {
     title: "Delete tag",
     buttonText: "delete",
     beforeInitFn: (_thisPopup) => {
-      _thisPopup.text = `Are you sure you want to delete tag ${_thisPopup.parameters[0]} ?`;
+      const tag = __nonReactive.getTag(_thisPopup.parameters[0] as string);
+      _thisPopup.text = `Are you sure you want to delete tag ${tag?.name ?? _thisPopup.parameters[0]}?`;
     },
     execFn: async (_thisPopup) => {
-      const tagId = _thisPopup.parameters[1] as string;
-      const response = await Ape.users.deleteTag({ params: { tagId } });
+      const tagId = _thisPopup.parameters[0] as string;
 
-      if (response.status !== 200) {
+      try {
+        await deleteTag({ tagId });
+      } catch (e) {
         return {
           status: "error",
-          message: "Failed to remove tag",
-          notificationOptions: { response },
+          message: "Failed to remove tag: " + errorMessage(e),
         };
       }
 
-      const snapshot = DB.getSnapshot();
-      if (snapshot?.tags) {
-        snapshot.tags = snapshot.tags.filter((it) => it._id !== tagId);
-      }
-
-      DB.deleteLocalTag(tagId);
-
+      deleteLocalTag(tagId);
       void Settings.update();
 
       return { status: "success", message: `Tag removed` };
@@ -140,31 +117,18 @@ const actionModals: Record<Action, SimpleModal> = {
     title: "Clear personal bests",
     buttonText: "clear",
     beforeInitFn: (_thisPopup) => {
-      _thisPopup.text = `Are you sure you want to clear personal bests for tag ${_thisPopup.parameters[0]} ?`;
+      const tag = __nonReactive.getTag(_thisPopup.parameters[0] as string);
+      _thisPopup.text = `Are you sure you want to clear personal bests for tag ${tag?.name ?? _thisPopup.parameters[0]}?`;
     },
     execFn: async (_thisPopup) => {
-      const tagId = _thisPopup.parameters[1] as string;
-      const response = await Ape.users.deleteTagPersonalBest({
-        params: { tagId },
-      });
+      const tagId = _thisPopup.parameters[0] as string;
 
-      if (response.status !== 200) {
+      try {
+        await clearTagPBs({ tagId });
+      } catch (e) {
         return {
           status: "error",
-          message: "Failed to clear tag pb",
-          notificationOptions: { response },
-        };
-      }
-
-      const matchingTag = getTagFromSnapshot(tagId);
-
-      if (matchingTag !== undefined) {
-        matchingTag.personalBests = {
-          time: {},
-          words: {},
-          quote: {},
-          zen: {},
-          custom: {},
+          message: "Failed to clear tag PBs: " + errorMessage(e),
         };
       }
 
@@ -177,14 +141,13 @@ const actionModals: Record<Action, SimpleModal> = {
 export function show(
   action: Action,
   id?: string,
-  name?: string,
   modalChain?: AnimatedModal,
 ): void {
   const options: ShowOptions = {
     modalChain,
     focusFirstInput: "focusAndSelect",
   };
-  if (action !== "add" && (name === undefined || id === undefined)) return;
+  if (action !== "add" && id === undefined) return;
 
-  actionModals[action].show([name ?? "", id ?? ""], options);
+  actionModals[action].show([id ?? ""], options);
 }
diff --git a/frontend/src/ts/modals/mini-result-chart.ts b/frontend/src/ts/modals/mini-result-chart.ts
deleted file mode 100644
index e30925d79b62..000000000000
--- a/frontend/src/ts/modals/mini-result-chart.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { ChartData } from "@monkeytype/schemas/results";
-import AnimatedModal from "../utils/animated-modal";
-import * as ChartController from "../controllers/chart-controller";
-import { Config } from "../config/store";
-function updateData(data: ChartData): void {
-  // let data = filteredResults[filteredId].chartData;
-  let labels = [];
-  for (let i = 1; i <= data.wpm.length; i++) {
-    labels.push(i.toString());
-  }
-
-  //make sure data.wpm and data.err are the same length as data.burst using slice
-  data.wpm = data.wpm.slice(0, data.burst.length);
-  data.err = data.err.slice(0, data.burst.length);
-  labels = labels.slice(0, data.burst.length);
-
-  ChartController.miniResult.data.labels = labels;
-
-  ChartController.miniResult.getDataset("wpm").data = data.wpm;
-  ChartController.miniResult.getDataset("burst").data = data.burst;
-  ChartController.miniResult.getDataset("error").data = data.err;
-
-  const maxChartVal = Math.max(
-    ...[Math.max(...data.wpm), Math.max(...data.burst)],
-  );
-  const minChartVal = Math.min(
-    ...[Math.min(...data.wpm), Math.min(...data.burst)],
-  );
-
-  ChartController.miniResult.getScale("wpm").max = Math.round(maxChartVal);
-  ChartController.miniResult.getScale("burst").max = Math.round(maxChartVal);
-
-  if (!Config.startGraphsAtZero) {
-    ChartController.miniResult.getScale("wpm").min = Math.round(minChartVal);
-    ChartController.miniResult.getScale("burst").min = Math.round(minChartVal);
-  } else {
-    ChartController.miniResult.getScale("wpm").min = 0;
-    ChartController.miniResult.getScale("burst").min = 0;
-  }
-}
-
-export function show(data: ChartData): void {
-  updateData(data);
-  void modal.show();
-}
-
-const modal = new AnimatedModal({
-  dialogId: "miniResultChartModal",
-});
diff --git a/frontend/src/ts/modals/new-filter-preset.ts b/frontend/src/ts/modals/new-filter-preset.ts
deleted file mode 100644
index 7a6b6c0efab8..000000000000
--- a/frontend/src/ts/modals/new-filter-preset.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { ResultFiltersSchema } from "@monkeytype/schemas/users";
-import { createFilterPreset } from "../elements/account/result-filters";
-import { SimpleModal } from "../elements/simple-modal";
-import { normalizeName } from "../utils/strings";
-
-export function show(): void {
-  newFilterPresetModal.show(undefined, {});
-}
-
-const newFilterPresetModal = new SimpleModal({
-  id: "newFilterPresetModal",
-  title: "New Filter Preset",
-  inputs: [
-    {
-      placeholder: "Preset Name",
-      type: "text",
-      initVal: "",
-      validation: {
-        isValid: async (name) => {
-          const parsed = ResultFiltersSchema.shape.name.safeParse(
-            normalizeName(name),
-          );
-          if (parsed.success) return true;
-          return parsed.error.errors.map((err) => err.message).join(", ");
-        },
-        debounceDelay: 0,
-      },
-    },
-  ],
-  buttonText: "add",
-  execFn: async (_thisPopup, name) => {
-    const cleanedName = ResultFiltersSchema.shape.name.parse(
-      normalizeName(name),
-    );
-    const status = await createFilterPreset(cleanedName);
-
-    if (status === 1) {
-      return { status: "success", message: "Filter preset created" };
-    } else {
-      let status: "error" | "notice" | "success" = "error";
-      let message: string = "Error creating filter preset";
-      return { status, message, alwaysHide: true };
-    }
-  },
-});
diff --git a/frontend/src/ts/pages/account.ts b/frontend/src/ts/pages/account.ts
deleted file mode 100644
index 9232daddee18..000000000000
--- a/frontend/src/ts/pages/account.ts
+++ /dev/null
@@ -1,1246 +0,0 @@
-import * as DB from "../db";
-import * as ResultFilters from "../elements/account/result-filters";
-import * as ChartController from "../controllers/chart-controller";
-
-import { Config } from "../config/store";
-import { setConfig } from "../config/setters";
-import * as MiniResultChartModal from "../modals/mini-result-chart";
-import * as Focus from "../test/focus";
-import * as TodayTracker from "../test/today-tracker";
-import {
-  showNoticeNotification,
-  showErrorNotification,
-} from "../states/notifications";
-import Page from "./page";
-import * as DateTime from "../utils/date-and-time";
-import * as Misc from "../utils/misc";
-import * as Arrays from "../utils/arrays";
-import * as Numbers from "@monkeytype/util/numbers";
-import { get as getTypingSpeedUnit } from "../utils/typing-speed-units";
-import { format } from "date-fns/format";
-import * as Skeleton from "../utils/skeleton";
-import type { ScaleChartOptions, LinearScaleOptions } from "chart.js";
-import { configEvent } from "../events/config";
-import { getActivePage } from "../states/core";
-import { getAuthenticatedUser } from "../firebase";
-
-import { showLoaderBar, hideLoaderBar } from "../states/loader-bar";
-import * as ResultBatches from "../elements/result-batches";
-import Format from "../singletons/format";
-import { ChartData } from "@monkeytype/schemas/results";
-import { Mode, Mode2, Mode2Custom } from "@monkeytype/schemas/shared";
-import { ResultFiltersGroupItem } from "@monkeytype/schemas/users";
-import { findLineByLeastSquares } from "../utils/numbers";
-import defaultResultFilters from "../constants/default-result-filters";
-import { SnapshotResult } from "../constants/default-snapshot";
-import Ape from "../ape";
-import { AccountChart } from "@monkeytype/schemas/configs";
-import { SortedTableWithLimit } from "../utils/sorted-table";
-import { qs, qsa, qsr, ElementWithUtils, onDOMReady } from "../utils/dom";
-import { sendVerificationEmail } from "../auth";
-
-let filterDebug = false;
-//toggle filterdebug
-export function toggleFilterDebug(): void {
-  filterDebug = !filterDebug;
-  if (filterDebug) {
-    console.log("filterDebug is on");
-  }
-}
-
-let filteredResults: SnapshotResult<Mode>[] = [];
-let visibleTableLines = 0;
-let historyTable: SortedTableWithLimit<SnapshotResult<Mode>>;
-
-function loadMoreLines(lineIndex?: number): void {
-  if (filteredResults === undefined || filteredResults.length === 0) return;
-  let newVisibleLines;
-  if (Numbers.isSafeNumber(lineIndex) && lineIndex > visibleTableLines) {
-    newVisibleLines = Math.ceil(lineIndex / 10) * 10;
-  } else {
-    newVisibleLines = visibleTableLines + 10;
-  }
-
-  visibleTableLines = newVisibleLines;
-  if (visibleTableLines >= filteredResults.length) {
-    qs(".pageAccount .loadMoreButton")?.hide();
-  } else {
-    qs(".pageAccount .loadMoreButton")?.show();
-  }
-
-  historyTable.setLimit(newVisibleLines);
-  historyTable.updateBody();
-}
-
-function buildResultRow(result: SnapshotResult<Mode>): HTMLTableRowElement {
-  let diff = result.difficulty ?? "normal";
-
-  let icons = `<span aria-label="${result.language?.replace(
-    "_",
-    " ",
-  )}" data-balloon-pos="up"><i class="fas fa-fw fa-globe-americas"></i></span>`;
-
-  if (diff === "normal") {
-    icons += `<span aria-label="${result.difficulty}" data-balloon-pos="up"><i class="far fa-fw fa-star"></i></span>`;
-  } else if (diff === "expert") {
-    icons += `<span aria-label="${result.difficulty}" data-balloon-pos="up"><i class="fas fa-fw fa-star-half-alt"></i></span>`;
-  } else if (diff === "master") {
-    icons += `<span aria-label="${result.difficulty}" data-balloon-pos="up"><i class="fas fa-fw fa-star"></i></span>`;
-  }
-
-  if (result.punctuation) {
-    icons += `<span aria-label="punctuation" data-balloon-pos="up"><i class="fas fa-fw fa-at"></i></span>`;
-  }
-
-  if (result.numbers) {
-    icons += `<span aria-label="numbers" data-balloon-pos="up"><i class="fas fa-fw fa-hashtag"></i></span>`;
-  }
-
-  if (result.blindMode) {
-    icons += `<span aria-label="blind mode" data-balloon-pos="up"><i class="fas fa-fw fa-eye-slash"></i></span>`;
-  }
-
-  if (result.lazyMode) {
-    icons += `<span aria-label="lazy mode" data-balloon-pos="up"><i class="fas fa-fw fa-couch"></i></span>`;
-  }
-
-  if (result.funbox !== undefined && result.funbox.length > 0) {
-    icons += `<span aria-label="${result.funbox
-      .map((it) => it.replace(/_/g, " "))
-      .join(
-        ", ",
-      )}" data-balloon-pos="up"><i class="fas fa-gamepad"></i></span>`;
-  }
-
-  if (result.chartData === "toolong" || result.testDuration > 122) {
-    icons += `<span class="miniResultChartButton disabled" aria-label="Graph history is not available for long tests" data-balloon-pos="up"><i class="fas fa-fw fa-chart-line"></i></span>`;
-  } else {
-    icons += `<span class="miniResultChartButton" aria-label="View graph" data-balloon-pos="up"><i class="fas fa-fw fa-chart-line"></i></span>`;
-  }
-
-  let tagNames = "no tags";
-
-  if (result.tags !== undefined && result.tags.length > 0) {
-    tagNames = "";
-    result.tags.forEach((tag) => {
-      DB.getSnapshot()?.tags?.forEach((snaptag) => {
-        if (tag === snaptag._id) {
-          tagNames += snaptag.display + ", ";
-        }
-      });
-    });
-    tagNames = tagNames.substring(0, tagNames.length - 2);
-  }
-
-  let restags;
-  if (result.tags === undefined) {
-    restags = "[]";
-  } else {
-    restags = JSON.stringify(result.tags);
-  }
-
-  const isActive = result.tags !== undefined && result.tags.length > 0;
-  const icon =
-    result.tags !== undefined && result.tags.length > 1 ? "fa-tags" : "fa-tag";
-
-  const resultTagsButton = `<button class="textButton resultEditTagsButton ${
-    isActive ? "active" : ""
-  }" data-result-id="${
-    result._id
-  }" data-tags='${restags}' aria-label="${tagNames}" data-balloon-pos="up"><i class="fas fa-fw ${icon}"></i></button>`;
-
-  let pb = "";
-  if (result.isPb) {
-    pb = '<i class="fas fa-fw fa-crown"></i>';
-  } else {
-    pb = "";
-  }
-
-  const charStats = result.charStats.join("/");
-
-  const mode2 = result.mode === "custom" ? "" : result.mode2;
-
-  const date = new Date(result.timestamp);
-
-  const element = document.createElement("tr");
-  element.classList.add("resultRow");
-  element.dataset["id"] = result._id;
-  element.innerHTML = `
-    <td>${pb}</td>
-    <td>${Format.typingSpeed(result.wpm, { showDecimalPlaces: true })}</td>
-    <td>${Format.typingSpeed(result.rawWpm, { showDecimalPlaces: true })}</td>
-    <td>${Format.percentage(result.acc, { showDecimalPlaces: true })}</td>
-    <td>${Format.percentage(result.consistency, {
-      showDecimalPlaces: true,
-    })}</td>
-    <td>${charStats}</td>
-    <td>${result.mode} ${mode2}</td>
-    <td class="infoIcons">${icons}</td>
-    <td>${resultTagsButton}</td>
-    <td>${format(date, "dd MMM yyyy")}<br>
-    ${format(date, "HH:mm")}
-    </td>
-    `;
-
-  return element;
-}
-
-function reset(): void {
-  historyTable.setData([]);
-  historyTable.updateBody();
-
-  ChartController.accountHistogram.getDataset("count").data = [];
-  ChartController.accountActivity.getDataset("count").data = [];
-  ChartController.accountActivity.getDataset("avgWpm").data = [];
-  ChartController.accountHistory.getDataset("wpm").data = [];
-  ChartController.accountHistory.getDataset("pb").data = [];
-  ChartController.accountHistory.getDataset("acc").data = [];
-  ChartController.accountHistory.getDataset("wpmAvgTen").data = [];
-  ChartController.accountHistory.getDataset("accAvgTen").data = [];
-  ChartController.accountHistory.getDataset("wpmAvgHundred").data = [];
-  ChartController.accountHistory.getDataset("accAvgHundred").data = [];
-}
-
-let totalSecondsFiltered = 0;
-let chartData: ChartController.HistoryChartData[] = [];
-let accChartData: ChartController.AccChartData[] = [];
-
-async function fillContent(): Promise<void> {
-  console.log("updating account page");
-
-  const snapshot = DB.getSnapshot();
-  if (!snapshot) return;
-
-  void ResultBatches.update();
-
-  chartData = [];
-  accChartData = [];
-  const wpmChartData: number[] = [];
-  visibleTableLines = 0;
-
-  let topWpm = 0;
-  let topMode = "";
-  let testRestarts = 0;
-  let totalWpm = 0;
-  let testCount = 0;
-
-  let last10 = 0;
-  let wpmLast10total = 0;
-
-  let topAcc = 0;
-  let totalAcc = 0;
-  let totalAcc10 = 0;
-
-  const rawWpm = {
-    total: 0,
-    count: 0,
-    last10Total: 0,
-    last10Count: 0,
-    max: 0,
-  };
-
-  let totalEstimatedWords = 0;
-
-  // let totalSeconds = 0;
-  totalSecondsFiltered = 0;
-
-  let topCons = 0;
-  let totalCons = 0;
-  let totalCons10 = 0;
-  let consCount = 0;
-
-  type ActivityChartData = Record<
-    number,
-    {
-      restarts: number;
-      amount: number;
-      time: number;
-      maxWpm: number;
-      totalWpm: number;
-      totalAcc: number;
-      totalCon: number;
-    }
-  >;
-
-  const activityChartData: ActivityChartData = {};
-  const histogramChartData: number[] = [];
-  const typingSpeedUnit = getTypingSpeedUnit(Config.typingSpeedUnit);
-
-  filteredResults = [];
-  qs(".pageAccount .history table tbody")?.empty();
-
-  DB.getSnapshot()?.results?.forEach((result) => {
-    // totalSeconds += tt;
-
-    //apply filters
-    try {
-      if (!ResultFilters.getFilter("pb", result.isPb ? "yes" : "no")) {
-        if (filterDebug) {
-          console.log(`skipping result due to pb filter`, result);
-        }
-        return;
-      }
-
-      let resdiff = result.difficulty ?? "normal";
-      if (!ResultFilters.getFilter("difficulty", resdiff)) {
-        if (filterDebug) {
-          console.log(`skipping result due to difficulty filter`, result);
-        }
-        return;
-      }
-      if (!ResultFilters.getFilter("mode", result.mode)) {
-        if (filterDebug) {
-          console.log(`skipping result due to mode filter`, result);
-        }
-        return;
-      }
-
-      if (result.mode === "time") {
-        let timefilter: Mode2<"time"> | "custom" = "custom";
-        if (
-          ["15", "30", "60", "120"].includes(
-            `${result.mode2}`, //legacy results could have a number in mode2
-          )
-        ) {
-          timefilter = `${result.mode2}` as `${number}`;
-        }
-        if (
-          !ResultFilters.getFilter(
-            "time",
-            timefilter as "custom" | "15" | "30" | "60" | "120",
-          )
-        ) {
-          if (filterDebug) {
-            console.log(`skipping result due to time filter`, result);
-          }
-          return;
-        }
-      } else if (result.mode === "words") {
-        let wordfilter: Mode2Custom<"words"> = "custom";
-        if (
-          ["10", "25", "50", "100", "200"].includes(
-            `${result.mode2}`, //legacy results could have a number in mode2
-          )
-        ) {
-          wordfilter = `${result.mode2}` as `${number}`;
-        }
-        if (
-          !ResultFilters.getFilter(
-            "words",
-            wordfilter as "custom" | "10" | "25" | "50" | "100",
-          )
-        ) {
-          if (filterDebug) {
-            console.log(`skipping result due to word filter`, result);
-          }
-          return;
-        }
-      }
-
-      if (result.quoteLength !== null) {
-        let filter: keyof typeof defaultResultFilters.quoteLength | undefined =
-          undefined;
-        if (result.quoteLength === 0) {
-          filter = "short";
-        } else if (result.quoteLength === 1) {
-          filter = "medium";
-        } else if (result.quoteLength === 2) {
-          filter = "long";
-        } else if (result.quoteLength === 3) {
-          filter = "thicc";
-        }
-        if (
-          filter !== undefined &&
-          !ResultFilters.getFilter("quoteLength", filter)
-        ) {
-          if (filterDebug) {
-            console.log(`skipping result due to quoteLength filter`, result);
-          }
-          return;
-        }
-      }
-
-      let langFilter = ResultFilters.getFilter("language", result.language);
-
-      if (
-        //legacy value for english_1k
-        (result.language as string) === "english_expanded" &&
-        ResultFilters.getFilter("language", "english_1k")
-      ) {
-        langFilter = true;
-      }
-      if (!langFilter) {
-        if (filterDebug) {
-          console.log(`skipping result due to language filter`, result);
-        }
-        return;
-      }
-
-      let puncfilter: ResultFiltersGroupItem<"punctuation"> = "off";
-      if (result.punctuation) {
-        puncfilter = "on";
-      }
-      if (!ResultFilters.getFilter("punctuation", puncfilter)) {
-        if (filterDebug) {
-          console.log(`skipping result due to punctuation filter`, result);
-        }
-        return;
-      }
-
-      let numfilter: ResultFiltersGroupItem<"numbers"> = "off";
-      if (result.numbers) {
-        numfilter = "on";
-      }
-      if (!ResultFilters.getFilter("numbers", numfilter)) {
-        if (filterDebug) {
-          console.log(`skipping result due to numbers filter`, result);
-        }
-        return;
-      }
-
-      if (result.funbox === undefined || result.funbox.length === 0) {
-        if (!ResultFilters.getFilter("funbox", "none")) {
-          if (filterDebug) {
-            console.log(`skipping result due to funbox filter`, result);
-          }
-          return;
-        }
-      } else {
-        let counter = 0;
-        for (const f of result.funbox) {
-          if (ResultFilters.getFilter("funbox", f)) {
-            counter++;
-            break;
-          }
-        }
-        if (counter === 0) {
-          if (filterDebug) {
-            console.log(`skipping result due to funbox filter`, result);
-          }
-          return;
-        }
-      }
-
-      let tagHide = true;
-      if (result.tags === undefined || result.tags.length === 0) {
-        //no tags, show when no tag is enabled
-        if ((DB.getSnapshot()?.tags?.length ?? 0) > 0) {
-          if (ResultFilters.getFilter("tags", "none")) tagHide = false;
-        } else {
-          tagHide = false;
-        }
-      } else {
-        //tags exist
-        const validTags = DB.getSnapshot()?.tags?.map((t) => t._id);
-
-        if (validTags === undefined) return;
-
-        result.tags.forEach((tag) => {
-          //check if i even need to check tags anymore
-          if (!tagHide) return;
-          //check if tag is valid
-          if (validTags?.includes(tag)) {
-            //tag valid, check if filter is on
-            if (ResultFilters.getFilter("tags", tag)) tagHide = false;
-          } else {
-            //tag not found in valid tags, meaning probably deleted
-            if (ResultFilters.getFilter("tags", "none")) tagHide = false;
-          }
-        });
-      }
-
-      if (tagHide) {
-        if (filterDebug) {
-          console.log(`skipping result due to tag filter`, result);
-        }
-        return;
-      }
-
-      const timeSinceTest = Math.abs(result.timestamp - Date.now()) / 1000;
-
-      let datehide = true;
-
-      if (
-        ResultFilters.getFilter("date", "all") ||
-        (ResultFilters.getFilter("date", "last_day") &&
-          timeSinceTest <= 86400) ||
-        (ResultFilters.getFilter("date", "last_week") &&
-          timeSinceTest <= 604800) ||
-        (ResultFilters.getFilter("date", "last_month") &&
-          timeSinceTest <= 2592000) ||
-        (ResultFilters.getFilter("date", "last_3months") &&
-          timeSinceTest <= 7776000)
-      ) {
-        datehide = false;
-      }
-
-      if (datehide) {
-        if (filterDebug) {
-          console.log(`skipping result due to date filter`, result);
-        }
-        return;
-      }
-
-      filteredResults.push(result);
-    } catch (e) {
-      showNoticeNotification(
-        "Something went wrong when filtering. Resetting filters.",
-      );
-      console.log(result);
-      console.error(e);
-      ResultFilters.reset();
-      ResultFilters.updateActive();
-      void update();
-      return;
-    }
-    //filters done
-    //=======================================
-
-    totalEstimatedWords += Math.round((result.wpm / 60) * result.testDuration);
-
-    const resultDate = new Date(result.timestamp);
-    resultDate.setSeconds(0);
-    resultDate.setMinutes(0);
-    resultDate.setHours(0);
-    resultDate.setMilliseconds(0);
-    const resultTimestamp = resultDate.getTime();
-
-    const dataForTimestamp = activityChartData[resultTimestamp];
-
-    if (dataForTimestamp !== undefined) {
-      dataForTimestamp.amount++;
-      dataForTimestamp.restarts += result.restartCount ?? 0;
-      dataForTimestamp.time +=
-        result.testDuration +
-        (result.incompleteTestSeconds ?? 0) -
-        (result.afkDuration ?? 0);
-      if (result.wpm > dataForTimestamp.maxWpm) {
-        dataForTimestamp.maxWpm = result.wpm;
-      }
-      dataForTimestamp.totalWpm += result.wpm;
-      dataForTimestamp.totalAcc += result.acc;
-      dataForTimestamp.totalCon += result.consistency ?? 0;
-    } else {
-      activityChartData[resultTimestamp] = {
-        amount: 1,
-        restarts: result.restartCount ?? 0,
-        time:
-          result.testDuration +
-          (result.incompleteTestSeconds ?? 0) -
-          (result.afkDuration ?? 0),
-        maxWpm: result.wpm,
-        totalWpm: result.wpm,
-        totalAcc: result.acc,
-        totalCon: result.consistency ?? 0,
-      };
-    }
-
-    const bucketSize = typingSpeedUnit.histogramDataBucketSize;
-    const bucket = Math.floor(
-      Math.round(typingSpeedUnit.fromWpm(result.wpm)) / bucketSize,
-    );
-
-    //grow array if needed
-    if (histogramChartData.length <= bucket) {
-      for (let i = histogramChartData.length; i <= bucket; i++) {
-        histogramChartData.push(0);
-      }
-    }
-    (histogramChartData[bucket] as number) += 1;
-
-    let tt = 0;
-    if (
-      result.testDuration === undefined &&
-      result.mode2 !== "custom" &&
-      result.mode2 !== "zen"
-    ) {
-      //test finished before testDuration field was introduced - estimate
-      if (result.mode === "time") {
-        tt = parseInt(result.mode2);
-      } else if (result.mode === "words") {
-        tt = (parseInt(result.mode2) / result.wpm) * 60;
-      }
-    } else {
-      tt = parseFloat(result.testDuration as unknown as string); //legacy results could have a string here
-    }
-    if (result.incompleteTestSeconds !== undefined) {
-      tt += result.incompleteTestSeconds;
-    } else if (result.restartCount !== undefined && result.restartCount > 0) {
-      tt += (tt / 4) * result.restartCount;
-    }
-
-    // if (result.incompleteTestSeconds !== undefined) {
-    //   tt += result.incompleteTestSeconds;
-    // } else if (result.restartCount !== undefined && result.restartCount > 0) {
-    //   tt += (tt / 4) * result.restartCount;
-    // }
-    totalSecondsFiltered += tt;
-
-    if (last10 < 10) {
-      last10++;
-      wpmLast10total += result.wpm;
-      totalAcc10 += result.acc;
-      if (result.consistency !== undefined) {
-        totalCons10 += result.consistency;
-      }
-    }
-    testCount++;
-
-    if (result.consistency !== undefined) {
-      consCount++;
-      totalCons += result.consistency;
-      if (result.consistency > topCons) {
-        topCons = result.consistency;
-      }
-    }
-
-    if (result.rawWpm !== null) {
-      if (rawWpm.last10Count < 10) {
-        rawWpm.last10Count++;
-        rawWpm.last10Total += result.rawWpm;
-      }
-      rawWpm.total += result.rawWpm;
-      rawWpm.count++;
-      if (result.rawWpm > rawWpm.max) {
-        rawWpm.max = result.rawWpm;
-      }
-    }
-
-    if (result.acc > topAcc) {
-      topAcc = result.acc;
-    }
-
-    totalAcc += result.acc;
-
-    if (result.restartCount !== undefined) {
-      testRestarts += result.restartCount;
-    }
-
-    chartData.push({
-      x: filteredResults.length,
-      y: Numbers.roundTo2(typingSpeedUnit.fromWpm(result.wpm)),
-      wpm: Numbers.roundTo2(typingSpeedUnit.fromWpm(result.wpm)),
-      acc: result.acc,
-      mode: result.mode,
-      mode2: result.mode2,
-      punctuation: result.punctuation,
-      language: result.language,
-      timestamp: result.timestamp,
-      difficulty: result.difficulty,
-      raw: Numbers.roundTo2(typingSpeedUnit.fromWpm(result.rawWpm)),
-      isPb: result.isPb ?? false,
-    });
-
-    wpmChartData.push(result.wpm);
-
-    accChartData.push({
-      x: filteredResults.length,
-      y: result.acc,
-      errorRate: 100 - result.acc,
-    });
-
-    if (result.wpm > topWpm) {
-      topWpm = result.wpm;
-      if (result.mode === "custom") {
-        topMode = result.mode;
-      } else {
-        const puncsctring = result.punctuation ? ",<br>with punctuation" : "";
-        const numbsctring = result.numbers ? ",<br>with numbers" : "";
-        topMode = result.mode + " " + result.mode2 + puncsctring + numbsctring;
-      }
-    }
-
-    totalWpm += result.wpm;
-  });
-
-  historyTable.setData(filteredResults);
-
-  qs(".pageAccount .group.history table thead tr td:nth-child(2)")?.setText(
-    Config.typingSpeedUnit,
-  );
-
-  await Misc.sleep(0);
-  loadMoreLines();
-  ////////
-
-  const activityChartData_timeAndAmount: ChartController.ActivityChartDataPoint[] =
-    [];
-  const activityChartData_avgWpm: ChartController.ActivityChartDataPoint[] = [];
-  const wpmStepSize = typingSpeedUnit.historyStepSize;
-
-  // let lastTimestamp = 0;
-  for (const date of Object.keys(activityChartData)) {
-    const dateInt = parseInt(date);
-    const dataPoint = activityChartData[dateInt];
-
-    if (dataPoint === undefined) continue;
-
-    activityChartData_timeAndAmount.push({
-      x: dateInt,
-      y: dataPoint.time / 60,
-      amount: dataPoint.amount,
-      restarts: dataPoint.restarts,
-      maxWpm: Numbers.roundTo2(typingSpeedUnit.fromWpm(dataPoint.maxWpm)),
-      avgWpm: Numbers.roundTo2(dataPoint.totalWpm / dataPoint.amount),
-      avgAcc: Numbers.roundTo2(dataPoint.totalAcc / dataPoint.amount),
-      avgCon: Numbers.roundTo2(dataPoint.totalCon / dataPoint.amount),
-    });
-    activityChartData_avgWpm.push({
-      x: dateInt,
-      y: Numbers.roundTo2(
-        typingSpeedUnit.fromWpm(dataPoint.totalWpm) / dataPoint.amount,
-      ),
-    });
-  }
-
-  const accountActivityScaleOptions = (
-    ChartController.accountActivity.options as ScaleChartOptions<"bar" | "line">
-  ).scales;
-
-  const accountActivityAvgWpmOptions = accountActivityScaleOptions[
-    "avgWpm"
-  ] as LinearScaleOptions;
-
-  accountActivityAvgWpmOptions.title.text = "Average " + Config.typingSpeedUnit;
-  accountActivityAvgWpmOptions.ticks.stepSize = wpmStepSize;
-
-  ChartController.accountActivity.getDataset("count").data =
-    activityChartData_timeAndAmount;
-  ChartController.accountActivity.getDataset("avgWpm").data =
-    activityChartData_avgWpm;
-
-  const histogramChartDataBucketed: { x: number; y: number }[] = [];
-  const labels: string[] = [];
-
-  const bucketSize = typingSpeedUnit.histogramDataBucketSize;
-  const bucketSizeUpperBound = bucketSize - (bucketSize <= 1 ? 0.01 : 1);
-
-  histogramChartData.forEach((amount: number, i: number) => {
-    const bucket = i * bucketSize;
-    labels.push(`${bucket} - ${bucket + bucketSizeUpperBound}`);
-    histogramChartDataBucketed.push({
-      x: bucket,
-      y: amount,
-    });
-  });
-
-  ChartController.accountHistogram.data.labels = labels;
-  ChartController.accountHistogram.getDataset("count").data =
-    histogramChartDataBucketed;
-
-  const accountHistoryScaleOptions = (
-    ChartController.accountHistory.options as ScaleChartOptions<"line">
-  ).scales;
-
-  const accountHistoryWpmOptions = accountHistoryScaleOptions[
-    "wpm"
-  ] as LinearScaleOptions;
-  accountHistoryWpmOptions.title.text = typingSpeedUnit.fullUnitString;
-
-  if (chartData.length > 0) {
-    // get pb points
-    let currentPb = 0;
-    const pb: { x: number; y: number }[] = [];
-
-    for (let i = chartData.length - 1; i >= 0; i--) {
-      const a = chartData[i] as ChartController.HistoryChartData;
-      if (a.y > currentPb) {
-        currentPb = a.y;
-        pb.push(a);
-      }
-    }
-
-    // add last point to pb
-    pb.push({
-      x: 1,
-      y: Arrays.lastElementFromArray(pb)?.y as number,
-    });
-
-    const avgTen = [];
-    const avgTenAcc = [];
-    const avgHundred = [];
-    const avgHundredAcc = [];
-
-    for (let i = 0; i < chartData.length; i++) {
-      // calculate averages of 10
-      const subsetTen = chartData.slice(i, i + 10);
-      const accSubsetTen = accChartData.slice(i, i + 10);
-      const avgTenValue =
-        subsetTen.reduce((acc, { y }) => acc + y, 0) / subsetTen.length;
-      const accAvgTenValue =
-        accSubsetTen.reduce((acc, { y }) => acc + y, 0) / accSubsetTen.length;
-
-      avgTen.push({ x: i + 1, y: avgTenValue });
-      avgTenAcc.push({ x: i + 1, y: accAvgTenValue });
-
-      // calculate averages of 100
-      const subsetHundred = chartData.slice(i, i + 100);
-      const accSubsetHundred = accChartData.slice(i, i + 100);
-      const avgHundredValue =
-        subsetHundred.reduce((acc, { y }) => acc + y, 0) / subsetHundred.length;
-      const accAvgHundredValue =
-        accSubsetHundred.reduce((acc, { y }) => acc + y, 0) /
-        accSubsetHundred.length;
-      avgHundred.push({ x: i + 1, y: avgHundredValue });
-      avgHundredAcc.push({ x: i + 1, y: accAvgHundredValue });
-    }
-
-    ChartController.accountHistory.getDataset("wpm").data = chartData;
-    ChartController.accountHistory.getDataset("pb").data = pb;
-    ChartController.accountHistory.getDataset("acc").data = accChartData;
-    ChartController.accountHistory.getDataset("wpmAvgTen").data = avgTen;
-    ChartController.accountHistory.getDataset("accAvgTen").data = avgTenAcc;
-    ChartController.accountHistory.getDataset("wpmAvgHundred").data =
-      avgHundred;
-    ChartController.accountHistory.getDataset("accAvgHundred").data =
-      avgHundredAcc;
-
-    ChartController.accountHistory.getScale("x").max = chartData.length + 1;
-  }
-
-  const wpms = chartData.map((r) => r.y);
-  const minWpm = Math.min(...wpms);
-  const maxWpm = Math.max(...wpms);
-  const minWpmChartVal = isFinite(minWpm) ? minWpm : 0;
-  const maxWpmChartVal = isFinite(maxWpm) ? maxWpm : 0;
-  const maxWpmChartValWithBuffer =
-    Math.floor(maxWpmChartVal) +
-    (wpmStepSize - (Math.floor(maxWpmChartVal) % wpmStepSize));
-
-  // let accuracies = accChartData.map((r) => r.y);
-  accountHistoryWpmOptions.max = maxWpmChartValWithBuffer;
-
-  accountHistoryWpmOptions.ticks.stepSize = wpmStepSize;
-
-  ChartController.accountHistory.getScale("pb").max = maxWpmChartValWithBuffer;
-  ChartController.accountHistory.getScale("wpmAvgTen").max =
-    maxWpmChartValWithBuffer;
-  ChartController.accountHistory.getScale("wpmAvgHundred").max =
-    maxWpmChartValWithBuffer;
-
-  if (!Config.startGraphsAtZero) {
-    const minWpmChartValFloor =
-      Math.floor(minWpmChartVal / wpmStepSize) * wpmStepSize;
-
-    ChartController.accountHistory.getScale("wpm").min = minWpmChartValFloor;
-    ChartController.accountHistory.getScale("pb").min = minWpmChartValFloor;
-    ChartController.accountHistory.getScale("wpmAvgTen").min =
-      minWpmChartValFloor;
-    ChartController.accountHistory.getScale("wpmAvgHundred").min =
-      minWpmChartValFloor;
-  } else {
-    ChartController.accountHistory.getScale("wpm").min = 0;
-    ChartController.accountHistory.getScale("pb").min = 0;
-    ChartController.accountHistory.getScale("wpmAvgTen").min = 0;
-    ChartController.accountHistory.getScale("wpmAvgHundred").min = 0;
-  }
-
-  if (chartData === undefined || chartData.length === 0) {
-    qs(".pageAccount .group.noDataError")?.show();
-    qs(".pageAccount .group.chart")?.hide();
-    qs(".pageAccount .group.dailyActivityChart")?.hide();
-    qs(".pageAccount .group.histogramChart")?.hide();
-    qs(".pageAccount .group.aboveHistory")?.hide();
-    qs(".pageAccount .group.history")?.hide();
-    qs(".pageAccount .triplegroup.stats")?.hide();
-    qs(".pageAccount .group.estimatedWordsTyped")?.hide();
-  } else {
-    qs(".pageAccount .group.noDataError")?.hide();
-    qs(".pageAccount .group.chart")?.show();
-    qs(".pageAccount .group.dailyActivityChart")?.show();
-    qs(".pageAccount .group.histogramChart")?.show();
-    qs(".pageAccount .group.aboveHistory")?.show();
-    qs(".pageAccount .group.history")?.show();
-    qs(".pageAccount .triplegroup.stats")?.show();
-    qs(".pageAccount .group.estimatedWordsTyped")?.show();
-  }
-
-  qs(".pageAccount .timeTotalFiltered .val")?.setText(
-    DateTime.secondsToString(Math.round(totalSecondsFiltered), true, true),
-  );
-
-  const speedUnit = Config.typingSpeedUnit;
-
-  qs(".pageAccount .highestWpm .title")?.setText(`highest ${speedUnit}`);
-  qs(".pageAccount .highestWpm .val")?.setText(Format.typingSpeed(topWpm));
-
-  qs(".pageAccount .averageWpm .title")?.setText(`average ${speedUnit}`);
-  qs(".pageAccount .averageWpm .val")?.setText(
-    Format.typingSpeed(totalWpm / testCount),
-  );
-
-  qs(".pageAccount .averageWpm10 .title")?.setText(
-    `average ${speedUnit} (last 10 tests)`,
-  );
-  qs(".pageAccount .averageWpm10 .val")?.setText(
-    Format.typingSpeed(wpmLast10total / last10),
-  );
-
-  qs(".pageAccount .highestRaw .title")?.setText(`highest raw ${speedUnit}`);
-  qs(".pageAccount .highestRaw .val")?.setText(Format.typingSpeed(rawWpm.max));
-
-  qs(".pageAccount .averageRaw .title")?.setText(`average raw ${speedUnit}`);
-  qs(".pageAccount .averageRaw .val")?.setText(
-    Format.typingSpeed(rawWpm.total / rawWpm.count),
-  );
-
-  qs(".pageAccount .averageRaw10 .title")?.setText(
-    `average raw ${speedUnit} (last 10 tests)`,
-  );
-  qs(".pageAccount .averageRaw10 .val")?.setText(
-    Format.typingSpeed(rawWpm.last10Total / rawWpm.last10Count),
-  );
-
-  qs(".pageAccount .highestWpm .mode")?.setHtml(topMode);
-  qs(".pageAccount .testsTaken .val")?.setText(testCount.toString());
-
-  qs(".pageAccount .highestAcc .val")?.setText(Format.accuracy(topAcc));
-  qs(".pageAccount .avgAcc .val")?.setText(
-    Format.accuracy(totalAcc / testCount),
-  );
-  qs(".pageAccount .avgAcc10 .val")?.setText(
-    Format.accuracy(totalAcc10 / last10),
-  );
-
-  if (totalCons === 0 || totalCons === undefined) {
-    qs(".pageAccount .avgCons .val")?.setText("-");
-    qs(".pageAccount .avgCons10 .val")?.setText("-");
-  } else {
-    qs(".pageAccount .highestCons .val")?.setText(Format.percentage(topCons));
-
-    qs(".pageAccount .avgCons .val")?.setText(
-      Format.percentage(totalCons / consCount),
-    );
-
-    qs(".pageAccount .avgCons10 .val")?.setText(
-      Format.percentage(totalCons10 / Math.min(last10, consCount)),
-    );
-  }
-
-  qs(".pageAccount .testsStarted .val")?.setText(`${testCount + testRestarts}`);
-  qs(".pageAccount .testsCompleted .val")?.setText(
-    `${testCount}(${Math.floor(
-      (testCount / (testCount + testRestarts)) * 100,
-    )}%)`,
-  );
-
-  qs(".pageAccount .testsCompleted .avgres")?.setText(`
-    ${(testRestarts / testCount).toFixed(1)} restarts per completed test
-  `);
-
-  const wpmPoints = filteredResults.map((r) => r.wpm).reverse();
-
-  const trend = findLineByLeastSquares(wpmPoints);
-  if (trend) {
-    const wpmChange = trend[1][1] - trend[0][1];
-    const wpmChangePerHour = wpmChange * (3600 / totalSecondsFiltered);
-    const plus = wpmChangePerHour > 0 ? "+" : "";
-    qs(".pageAccount .group.chart .below .text")?.setText(
-      `Speed change per hour spent typing: ${
-        plus + Format.typingSpeed(wpmChangePerHour, { showDecimalPlaces: true })
-      } ${Config.typingSpeedUnit}`,
-    );
-  }
-  qs(".pageAccount .estimatedWordsTyped .val")?.setText(
-    totalEstimatedWords.toString(),
-  );
-
-  if (chartData.length || accChartData.length) {
-    ChartController.updateAccountChartButtons();
-    ChartController.accountHistory.options.animation = false;
-    ChartController.accountHistory.update();
-    delete ChartController.accountHistory.options.animation;
-  }
-  await Misc.sleep(0);
-  ChartController.accountActivity.update();
-  ChartController.accountHistogram.update();
-  Focus.set(false);
-  qs(".page.pageAccount")?.setStyle({ height: "unset" }); //weird safari fix
-}
-
-export async function downloadResults(offset?: number): Promise<void> {
-  const results = await DB.getUserResults(offset);
-
-  TodayTracker.addAllFromToday();
-  if (results) {
-    ResultFilters.updateActive();
-  }
-}
-
-async function update(): Promise<void> {
-  await downloadResults();
-  try {
-    await Misc.sleep(0);
-    await fillContent();
-  } catch (e) {
-    console.error(e);
-    showErrorNotification(`Something went wrong: ${e}`);
-  }
-}
-
-export function updateTagsForResult(resultId: string, tagIds: string[]): void {
-  const tagNames: string[] = [];
-
-  if (tagIds.length > 0) {
-    for (const tag of tagIds) {
-      DB.getSnapshot()?.tags?.forEach((snaptag) => {
-        if (tag === snaptag._id) {
-          tagNames.push(snaptag.display);
-        }
-      });
-    }
-  }
-
-  const el = qs(
-    `.pageAccount .resultEditTagsButton[data-result-id='${resultId}']`,
-  );
-
-  el?.setAttribute("data-tags", JSON.stringify(tagIds));
-
-  if (tagIds.length > 0) {
-    el?.setAttribute("aria-label", tagNames.join(", "));
-    el?.addClass("active");
-    if (tagIds.length > 1) {
-      el?.setHtml(`<i class="fas fa-fw fa-tags"></i>`);
-    } else {
-      el?.setHtml(`<i class="fas fa-fw fa-tag"></i>`);
-    }
-  } else {
-    el?.setAttribute("aria-label", "no tags");
-    el?.removeClass("active");
-    el?.setHtml(`<i class="fas fa-fw fa-tag"></i>`);
-  }
-}
-
-qs(".pageAccount button.toggleResultsOnChart")?.on("click", () => {
-  const newValue = [...Config.accountChart] as AccountChart;
-  newValue[0] = newValue[0] === "on" ? "off" : "on";
-  setConfig("accountChart", newValue);
-});
-
-qs(".pageAccount button.toggleAccuracyOnChart")?.on("click", () => {
-  const newValue = [...Config.accountChart] as AccountChart;
-  newValue[1] = newValue[1] === "on" ? "off" : "on";
-  setConfig("accountChart", newValue);
-});
-
-qs(".pageAccount button.toggleAverage10OnChart")?.on("click", () => {
-  const newValue = [...Config.accountChart] as AccountChart;
-  newValue[2] = newValue[2] === "on" ? "off" : "on";
-  setConfig("accountChart", newValue);
-});
-
-qs(".pageAccount button.toggleAverage100OnChart")?.on("click", () => {
-  const newValue = [...Config.accountChart] as AccountChart;
-  newValue[3] = newValue[3] === "on" ? "off" : "on";
-  setConfig("accountChart", newValue);
-});
-
-qs(".pageAccount .loadMoreButton")?.on("click", () => {
-  loadMoreLines();
-});
-
-qs(".pageAccount #accountHistoryChart")?.on("click", () => {
-  const chart = ChartController.accountHistory;
-  const active = chart.tooltip?.getActiveElements?.() ?? [];
-  if (!active.length) return;
-
-  const index = active[0]?.index;
-  if (index === undefined) return;
-
-  loadMoreLines(index);
-
-  const resultId = filteredResults[index]?._id;
-  if (resultId === undefined) {
-    throw new Error("Cannot find result for index " + index);
-  }
-
-  const element = qs(`.resultRow[data-id="${resultId}"]`);
-  qsa(".resultRow").removeClass("active");
-
-  element?.scrollIntoView({ block: "center" });
-  element?.addClass("active");
-});
-
-qs(".pageAccount")?.onChild(
-  "click",
-  ".miniResultChartButton",
-  async (event) => {
-    const target = new ElementWithUtils(event.childTarget as HTMLElement);
-    const resultId: string = target
-      .closestParent("tr")
-      ?.getAttribute("data-id") as string;
-    if (target.hasClass("loading")) return;
-    if (target.hasClass("disabled")) return;
-
-    const result = filteredResults.find((it) => it._id === resultId);
-    if (result === undefined) return;
-
-    let chartData = result.chartData as ChartData;
-
-    if (chartData === undefined) {
-      //need to load full result
-      target?.addClass("loading");
-      target?.removeAttribute("aria-label");
-      target?.setHtml('<i class="fas fa-fw fa-spin fa-circle-notch"></i>');
-      showLoaderBar();
-
-      const response = await Ape.results.getById({
-        params: { resultId: result._id },
-      });
-      hideLoaderBar();
-
-      target?.setHtml('<i class="fas fa-fw fa-chart-line"></i>');
-      target?.removeClass("loading");
-
-      if (response.status !== 200) {
-        showErrorNotification("Error fetching result", { response });
-        return;
-      }
-
-      chartData = response.body.data.chartData as ChartData;
-
-      //update local cache
-      result.chartData = chartData;
-      const dbResult = DB.getSnapshot()?.results?.find(
-        (it) => it._id === result._id,
-      );
-      if (dbResult !== undefined) {
-        dbResult.chartData = result.chartData;
-      }
-
-      if (response.body.data.chartData === "toolong") {
-        target?.setAttribute(
-          "aria-label",
-          "Graph history is not available for long tests",
-        );
-        target?.setAttribute("data-balloon-pos", "up");
-        target.addClass("disabled");
-
-        showNoticeNotification("Graph history is not available for long tests");
-        return;
-      }
-    }
-    target?.setAttribute("aria-label", "View graph");
-    MiniResultChartModal.show(chartData);
-  },
-);
-
-const filterButtons = qsa(
-  ".pageAccount .group.topFilters, .pageAccount .filterButtons",
-);
-
-filterButtons.forEach((filterButton) => {
-  filterButton.onChild("click", "button", () => {
-    setTimeout(() => {
-      void update();
-    }, 0);
-  });
-});
-
-qs(".pageAccount .group.presetFilterButtons")?.onChild(
-  "click",
-  ".filterBtns .filterPresets .select-filter-preset",
-  async (e) => {
-    const target = e.childTarget as HTMLElement;
-    await ResultFilters.setFilterPreset(
-      target.getAttribute("data-id") as string,
-    );
-    void update();
-  },
-);
-
-qs(".pageAccount .content .group.aboveHistory .exportCSV")?.on("click", () => {
-  showLoaderBar();
-  void Misc.downloadResultsCSV(filteredResults).finally(() => {
-    hideLoaderBar();
-  });
-});
-
-qs(".pageAccount button.loadMoreResults")?.on("click", async () => {
-  const offset = DB.getSnapshot()?.results?.length ?? 0;
-
-  showLoaderBar();
-  ResultBatches.disableButton();
-
-  await downloadResults(offset);
-  await fillContent();
-  hideLoaderBar();
-});
-
-qs(".pageAccount")?.onChild("click", ".sendVerificationEmail", async () => {
-  qs(".sendVerificationEmail")?.disable();
-  await sendVerificationEmail();
-  qs(".sendVerificationEmail")?.enable();
-});
-
-configEvent.subscribe(({ key }) => {
-  if (getActivePage() === "account" && key === "typingSpeedUnit") {
-    void update();
-  }
-});
-
-export const page = new Page<undefined>({
-  id: "account",
-  element: qsr(".page.pageAccount"),
-  path: "/account",
-  loadingOptions: {
-    loadingMode: () => {
-      if (DB.getSnapshot()?.results === undefined) {
-        return "sync";
-      } else {
-        return "none";
-      }
-    },
-    loadingPromise: async () => {
-      if (DB.getSnapshot() === null) {
-        throw new Error(
-          "Looks like your account data didn't download correctly. Please refresh the page.<br>If this error persists, please contact support.",
-        );
-      }
-      return downloadResults();
-    },
-    style: "bar",
-    keyframes: [
-      {
-        percentage: 90,
-        durationMs: 2000,
-        text: "Downloading results...",
-      },
-    ],
-  },
-  afterHide: async (): Promise<void> => {
-    reset();
-    Skeleton.remove("pageAccount");
-  },
-  beforeShow: async (): Promise<void> => {
-    Skeleton.append("pageAccount", "main");
-    await ResultFilters.appendDropdowns(update);
-    ResultFilters.updateActive();
-    await Misc.sleep(0);
-
-    historyTable ??= new SortedTableWithLimit<SnapshotResult<Mode>>({
-      limit: 10,
-      table: qsr(".pageAccount .content .history table"),
-      data: filteredResults,
-      buildRow: (val) => {
-        return buildResultRow(val);
-      },
-      initialSort: { property: "timestamp", descending: true },
-    });
-
-    await update().then(() => {
-      qs(".pageAccount .content .accountVerificatinNotice")?.remove();
-      if (getAuthenticatedUser()?.emailVerified === false) {
-        qs(".pageAccount .content")?.prependHtml(
-          `<div class="accountVerificatinNotice"><i class="fas icon fa-exclamation-triangle"></i><p>Your email address is still not verified</p><button class="sendVerificationEmail">resend verification email</button></div>`,
-        );
-      }
-      ResultBatches.showOrHideIfNeeded();
-    });
-  },
-});
-
-onDOMReady(() => {
-  Skeleton.save("pageAccount");
-});
diff --git a/frontend/src/ts/pages/settings.ts b/frontend/src/ts/pages/settings.ts
index 390b55f1597a..c3e93fd4ec14 100644
--- a/frontend/src/ts/pages/settings.ts
+++ b/frontend/src/ts/pages/settings.ts
@@ -8,7 +8,11 @@ import * as Misc from "../utils/misc";
 import * as Strings from "../utils/strings";
 import * as DB from "../db";
 import * as Funbox from "../test/funbox/funbox";
-import * as TagController from "../controllers/tag-controller";
+import {
+  __nonReactive,
+  toggleTagActive,
+  useTagsLiveQuery,
+} from "../collections/tags";
 import * as PresetController from "../controllers/preset-controller";
 import * as ThemePicker from "../elements/settings/theme-picker";
 import {
@@ -51,6 +55,8 @@ import { authEvent } from "../events/auth";
 import * as FpsLimitSection from "../elements/settings/fps-limit-section";
 import { qs, qsa, qsr, onDOMReady } from "../utils/dom";
 import { showPopup } from "../modals/simple-modals-base";
+import { createEffectOn } from "../hooks/effects";
+import { createMemo } from "solid-js";
 
 let settingsInitialized = false;
 
@@ -516,23 +522,25 @@ function setActiveFunboxButton(): void {
   }
 }
 
+const tagsQuery = useTagsLiveQuery();
+const activeTags = createMemo(() => tagsQuery().filter((tag) => tag.active));
+createEffectOn(activeTags, refreshTagsSettingsSection);
+
 function refreshTagsSettingsSection(): void {
   if (isAuthenticated() && DB.getSnapshot()) {
     const tagsEl = qs(".pageSettings .section.tags .tagsList")?.empty();
-    DB.getSnapshot()?.tags?.forEach((tag) => {
+    __nonReactive.getTags().forEach((tag) => {
       // let tagPbString = "No PB found";
       // if (tag.pb !== undefined && tag.pb > 0) {
       //   tagPbString = `PB: ${tag.pb}`;
       // }
       tagsEl?.appendHtml(`
 
-      <div class="buttons tag" data-id="${tag._id}" data-name="${
-        tag.name
-      }" data-display="${tag.display}">
+      <div class="buttons tag" data-id="${tag._id}" data-name="${tag.name}">
         <button class="tagButton ${tag.active ? "active" : ""}" active="${
           tag.active
         }">
-          ${tag.display}
+          ${tag.name}
         </button>
         <button class="clearPbButton" aria-label="clear tags personal bests" data-balloon-pos="left" >
           <i class="fas fa-crown fa-fw"></i>
@@ -786,7 +794,7 @@ qs(".pageSettings .section.tags")?.onChild(
   (e) => {
     const target = e.childTarget as HTMLElement;
     const tagid = target.parentElement?.getAttribute("data-id") as string;
-    TagController.toggle(tagid);
+    toggleTagActive(tagid);
     target.classList.toggle("active");
   },
 );
diff --git a/frontend/src/ts/states/core.ts b/frontend/src/ts/states/core.ts
index b8023581092b..c50a6dfdf6ee 100644
--- a/frontend/src/ts/states/core.ts
+++ b/frontend/src/ts/states/core.ts
@@ -31,6 +31,7 @@ export const [getIsScreenshotting, setIsScreenshotting] = createSignal(false);
 
 export const [getUserId, setUserId] = createSignal<string | null>(null);
 export const isAuthenticated = (): boolean => getUserId() !== null;
+export const [isUserVerified, setUserVerified] = createSignal(false);
 
 export const [getSelectedProfileName, setSelectedProfileName] = createSignal<
   string | undefined
diff --git a/frontend/src/ts/states/modals.ts b/frontend/src/ts/states/modals.ts
index fa2fac25505e..8989105176c7 100644
--- a/frontend/src/ts/states/modals.ts
+++ b/frontend/src/ts/states/modals.ts
@@ -23,7 +23,8 @@ export type ModalId =
   | "TestDuration"
   | "ShareTestSettings"
   | "CustomWordAmount"
-  | "MobileTestConfig";
+  | "MobileTestConfig"
+  | "MiniResultChartModal";
 
 export type ModalVisibility = {
   visible: boolean;
diff --git a/frontend/src/ts/states/result-filters.ts b/frontend/src/ts/states/result-filters.ts
new file mode 100644
index 000000000000..96e7db7aa23d
--- /dev/null
+++ b/frontend/src/ts/states/result-filters.ts
@@ -0,0 +1,44 @@
+import { ResultFilters, ResultFiltersSchema } from "@monkeytype/schemas/users";
+import { mergeWithDefaultFilters } from "../components/pages/account/utils";
+import defaultResultFilters from "../constants/default-result-filters";
+import { useLocalStorageStore } from "../hooks/useLocalStorageStore";
+import { isObject } from "../utils/misc";
+import { sanitize } from "../utils/sanitize";
+
+export const [filters, setFilters] = useLocalStorageStore({
+  key: "resultFilters",
+  schema: ResultFiltersSchema,
+  fallback: defaultResultFilters,
+  migrate: migrateFilterStorage,
+});
+
+function migrateFilterStorage(input: unknown): ResultFilters {
+  if (!isObject(input)) {
+    return defaultResultFilters;
+  }
+  const filters = sanitize(
+    ResultFiltersSchema.partial().strip(),
+    input as ResultFilters,
+  );
+  return mergeWithDefaultFilters(filters);
+}
+
+export function updateTagsInFilterStorage(tagsIds: string[]): void {
+  setFilters((filters) => {
+    const result = mergeWithDefaultFilters(filters);
+    const snapshotTags = new Set(["none", ...tagsIds]);
+
+    //remove tags that no longer exist.
+    let newTags = new Map(
+      Object.entries(result.tags).filter(([id]) => snapshotTags.has(id)),
+    );
+
+    //add new tags added
+    tagsIds
+      .filter((id) => !newTags.has(id))
+      .forEach((newId) => newTags.set(newId, true));
+
+    result.tags = Object.fromEntries(newTags.entries());
+    return result;
+  });
+}
diff --git a/frontend/src/ts/states/snapshot.ts b/frontend/src/ts/states/snapshot.ts
index 9b7eb087219c..21ccc6845ef6 100644
--- a/frontend/src/ts/states/snapshot.ts
+++ b/frontend/src/ts/states/snapshot.ts
@@ -5,7 +5,7 @@ import { Mode } from "@monkeytype/schemas/shared";
 
 export type MiniSnapshot = Omit<
   Snapshot,
-  "results" | "tags" | "presets" | "filterPresets"
+  "results" | "presets" | "filterPresets"
 >;
 const [snapshot, updateSnapshot] = createStore<{
   value: MiniSnapshot | undefined;
diff --git a/frontend/src/ts/test/pace-caret.ts b/frontend/src/ts/test/pace-caret.ts
index 064d8a29428a..80de9f36c749 100644
--- a/frontend/src/ts/test/pace-caret.ts
+++ b/frontend/src/ts/test/pace-caret.ts
@@ -1,12 +1,14 @@
 import * as TestWords from "./test-words";
 import { Config } from "../config/store";
 import * as DB from "../db";
+import { getActiveTagsPB } from "../collections/tags";
 import * as Misc from "../utils/misc";
 import * as TestState from "./test-state";
 import { configEvent } from "../events/config";
 import { getActiveFunboxes } from "./funbox/list";
 import { Caret } from "../elements/caret";
 import { qsr } from "../utils/dom";
+import { getUserAverage10, getUserDailyBest } from "../collections/results";
 
 type Settings = {
   wpm: number;
@@ -72,7 +74,7 @@ export async function init(): Promise<void> {
         )
       )?.wpm ?? 0;
   } else if (Config.paceCaret === "tagPb") {
-    wpm = await DB.getActiveTagsPB(
+    wpm = getActiveTagsPB(
       Config.mode,
       mode2,
       Config.punctuation,
@@ -82,27 +84,9 @@ export async function init(): Promise<void> {
       Config.lazyMode,
     );
   } else if (Config.paceCaret === "average") {
-    [wpm] = await DB.getUserAverage10(
-      Config.mode,
-      mode2,
-      Config.punctuation,
-      Config.numbers,
-      Config.language,
-      Config.difficulty,
-      Config.lazyMode,
-    );
-    wpm = Math.round(wpm);
+    wpm = Math.round((await getUserAverage10({ ...Config, mode2 })).wpm);
   } else if (Config.paceCaret === "daily") {
-    wpm = await DB.getUserDailyBest(
-      Config.mode,
-      mode2,
-      Config.punctuation,
-      Config.numbers,
-      Config.language,
-      Config.difficulty,
-      Config.lazyMode,
-    );
-    wpm = Math.round(wpm);
+    wpm = Math.round((await getUserDailyBest({ ...Config, mode2 })).wpm);
   } else if (Config.paceCaret === "custom") {
     wpm = Config.paceCaretCustomSpeed;
   } else if (Config.paceCaret === "last" || TestState.isPaceRepeat) {
diff --git a/frontend/src/ts/test/result.ts b/frontend/src/ts/test/result.ts
index 89cdf90de22a..b416332dba65 100644
--- a/frontend/src/ts/test/result.ts
+++ b/frontend/src/ts/test/result.ts
@@ -45,7 +45,12 @@ import Ape from "../ape";
 import { CompletedEvent } from "@monkeytype/schemas/results";
 import { getActiveFunboxes, isFunboxActiveWithProperty } from "./funbox/list";
 import { getFunbox } from "@monkeytype/funbox";
-import { SnapshotUserTag } from "../constants/default-snapshot";
+import {
+  getLocalTagPB,
+  saveLocalTagPB,
+  type TagItem,
+  __nonReactive,
+} from "../collections/tags";
 import { Language } from "@monkeytype/schemas/languages";
 import { canQuickRestart as canQuickRestartFn } from "../utils/quick-restart";
 import { LocalStorageWithSchema } from "../utils/local-storage-with-schema";
@@ -662,15 +667,8 @@ export function showConfetti(): void {
 }
 
 async function updateTags(dontSave: boolean): Promise<void> {
-  const activeTags: SnapshotUserTag[] = [];
-  const userTagsCount = DB.getSnapshot()?.tags?.length ?? 0;
-  try {
-    DB.getSnapshot()?.tags?.forEach((tag) => {
-      if (tag.active === true) {
-        activeTags.push(tag);
-      }
-    });
-  } catch (e) {}
+  const activeTags: TagItem[] = __nonReactive.getActiveTags();
+  const userTagsCount = __nonReactive.getTags().length;
 
   if (userTagsCount === 0) {
     qs("#result .stats .tags")?.hide();
@@ -697,7 +695,7 @@ async function updateTags(dontSave: boolean): Promise<void> {
   let annotationSide: LabelPosition = "start";
   let labelAdjust = 15;
   for (const tag of activeTags) {
-    const tpb = await DB.getLocalTagPB(
+    const tpb = getLocalTagPB(
       tag._id,
       Config.mode,
       result.mode2,
@@ -708,7 +706,7 @@ async function updateTags(dontSave: boolean): Promise<void> {
       Config.lazyMode,
     );
     qs("#result .stats .tags .bottom")?.appendHtml(`
-      <div tagid="${tag._id}" aria-label="PB: ${tpb}" data-balloon-pos="up">${tag.display}<i class="fas fa-crown hidden"></i></div>
+      <div tagid="${tag._id}" aria-label="PB: ${tpb}" data-balloon-pos="up">${tag.name}<i class="fas fa-crown hidden"></i></div>
     `);
     const typingSpeedUnit = getTypingSpeedUnit(Config.typingSpeedUnit);
     if (
@@ -718,7 +716,7 @@ async function updateTags(dontSave: boolean): Promise<void> {
     ) {
       if (tpb < result.wpm) {
         //new pb for that tag
-        await DB.saveLocalTagPB(
+        saveLocalTagPB(
           tag._id,
           Config.mode,
           result.mode2,
@@ -763,7 +761,7 @@ async function updateTags(dontSave: boolean): Promise<void> {
             position: annotationSide,
             xAdjust: labelAdjust,
             display: true,
-            content: `${tag.display} PB: ${Numbers.roundTo2(
+            content: `${tag.name} PB: ${Numbers.roundTo2(
               typingSpeedUnit.fromWpm(tpb),
             ).toFixed(2)}`,
           },
@@ -1268,11 +1266,10 @@ export function updateTagsAfterEdit(
 
   if (tagIds.length > 0) {
     for (const tag of tagIds) {
-      DB.getSnapshot()?.tags?.forEach((snaptag) => {
-        if (tag === snaptag._id) {
-          tagNames.push(snaptag.display);
-        }
-      });
+      const localTag = __nonReactive.getTag(tag);
+      if (localTag !== undefined) {
+        tagNames.push(localTag.name);
+      }
     }
   }
 
diff --git a/frontend/src/ts/test/test-logic.ts b/frontend/src/ts/test/test-logic.ts
index fb864c967b81..b276f7f14ec7 100644
--- a/frontend/src/ts/test/test-logic.ts
+++ b/frontend/src/ts/test/test-logic.ts
@@ -22,6 +22,7 @@ import * as Caret from "./caret";
 import * as TestTimer from "./test-timer";
 import * as DB from "../db";
 import * as Replay from "./replay";
+import { __nonReactive } from "../collections/tags";
 import * as TodayTracker from "./today-tracker";
 import * as ChallengeContoller from "../controllers/challenge-controller";
 import { clearQuoteStats } from "../states/quote-rate";
@@ -810,12 +811,9 @@ function buildCompletedEvent(
   }
 
   //tags
-  const activeTagsIds: string[] = [];
-  for (const tag of DB.getSnapshot()?.tags ?? []) {
-    if (tag.active === true) {
-      activeTagsIds.push(tag._id);
-    }
-  }
+  const activeTagsIds: string[] = __nonReactive
+    .getActiveTags()
+    .map((tag) => tag._id);
 
   const duration = parseFloat(stats.time.toString());
   const afkDuration = TestStats.calculateAfkSeconds(duration);
diff --git a/frontend/src/ts/test/test-screenshot.ts b/frontend/src/ts/test/test-screenshot.ts
index 94c1498f1496..c80e511c045e 100644
--- a/frontend/src/ts/test/test-screenshot.ts
+++ b/frontend/src/ts/test/test-screenshot.ts
@@ -248,6 +248,7 @@ export async function copyToClipboard(): Promise<void> {
     }
     try {
       // Attempt to copy using ClipboardItem API
+      // oxlint-disable-next-line compat/compat
       const clipItem = new ClipboardItem(
         Object.defineProperty({}, blob.type, {
           value: blob,
diff --git a/frontend/src/ts/test/today-tracker.ts b/frontend/src/ts/test/today-tracker.ts
index 592d2077db23..65099eb912a1 100644
--- a/frontend/src/ts/test/today-tracker.ts
+++ b/frontend/src/ts/test/today-tracker.ts
@@ -1,5 +1,5 @@
+import { __nonReactive } from "../collections/results";
 import * as DateTime from "../utils/date-and-time";
-import * as DB from "../db";
 
 let seconds = 0;
 let addedAllToday = false;
@@ -31,11 +31,9 @@ export function addAllFromToday(): void {
   const todayDateMS = todayDate.getTime();
 
   seconds = 0;
-  const snapshot = DB.getSnapshot();
-  if (!snapshot) return;
-  const results = snapshot.results;
+  const results = __nonReactive.getResults();
 
-  results?.forEach((result) => {
+  for (const result of results) {
     const resultDate = new Date(result.timestamp);
     resultDate.setSeconds(0);
     resultDate.setMinutes(0);
@@ -47,7 +45,7 @@ export function addAllFromToday(): void {
       seconds +=
         result.testDuration + result.incompleteTestSeconds - result.afkDuration;
     }
-  });
+  }
 
   addedAllToday = true;
 }
diff --git a/frontend/src/ts/utils/local-storage-with-schema.ts b/frontend/src/ts/utils/local-storage-with-schema.ts
index 267586b2bce1..4c1c35f399de 100644
--- a/frontend/src/ts/utils/local-storage-with-schema.ts
+++ b/frontend/src/ts/utils/local-storage-with-schema.ts
@@ -45,7 +45,7 @@ export class LocalStorageWithSchema<T> {
     }
 
     let migrated = false;
-    const { data: parsed, error } = tryCatchSync(() =>
+    let { data: parsed, error } = tryCatchSync(() =>
       parseJsonWithSchema(value, this.schema, {
         fallback: this.fallback,
         migrate: (oldData, zodIssues) => {
@@ -83,7 +83,7 @@ export class LocalStorageWithSchema<T> {
     }
 
     console.debug(`LS ${this.key} Got value:`, parsed);
-    this.cache = parsed;
+    this.cache = parsed as T;
     return structuredClone(this.cache);
   }
 
diff --git a/frontend/src/ts/utils/strings.ts b/frontend/src/ts/utils/strings.ts
index a79458f176ea..e0cc500323ca 100644
--- a/frontend/src/ts/utils/strings.ts
+++ b/frontend/src/ts/utils/strings.ts
@@ -142,7 +142,7 @@ export function getLanguageDisplayString(
   } else {
     out = language;
   }
-  return out.replace(/_/g, " ");
+  return replaceUnderscoresWithSpaces(out);
 }
 
 /**
@@ -377,6 +377,14 @@ export function isSpace(char: string): boolean {
   return spaces.has(codePoint);
 }
 
+export function replaceUnderscoresWithSpaces(text: string): string {
+  return text.replace(/_/g, " ");
+}
+
+export function replaceSpacesWithUnderscores(text: string): string {
+  return text.replace(/ /g, "_");
+}
+
 // Export testing utilities for unit tests
 export const __testing = {
   hasRTLCharacters,
diff --git a/frontend/src/ts/utils/types.ts b/frontend/src/ts/utils/types.ts
new file mode 100644
index 000000000000..61d2e37b543a
--- /dev/null
+++ b/frontend/src/ts/utils/types.ts
@@ -0,0 +1,15 @@
+export type OneOf<T> = {
+  [K in keyof T]: {
+    [P in K]: T[P];
+  } & {
+    [P in Exclude<keyof T, K>]?: never;
+  };
+}[keyof T];
+
+export type ExactlyOneTrue<T extends Record<string, boolean>> = {
+  [K in keyof T]: {
+    [P in K]: true;
+  } & {
+    [P in Exclude<keyof T, K>]?: false | never;
+  };
+}[keyof T];
diff --git a/frontend/src/ts/utils/typing-speed-units.ts b/frontend/src/ts/utils/typing-speed-units.ts
index 7539f1e54102..ef96dd96db44 100644
--- a/frontend/src/ts/utils/typing-speed-units.ts
+++ b/frontend/src/ts/utils/typing-speed-units.ts
@@ -1,6 +1,6 @@
 import { TypingSpeedUnit } from "@monkeytype/schemas/configs";
 
-type TypingSpeedUnitSettings = {
+export type TypingSpeedUnitSettings = {
   fromWpm: (number: number) => number;
   toWpm: (number: number) => number;
   fullUnitString: string;
diff --git a/frontend/static/contributors.json b/frontend/static/contributors.json
index da49e06dd08d..dde685fa4dd4 100644
--- a/frontend/static/contributors.json
+++ b/frontend/static/contributors.json
@@ -1160,4 +1160,4 @@
   "Jeroen Meijer (Jay)",
   "Jierie Ezequiel Jacla",
   "Joel Bradshaw"
-]
\ No newline at end of file
+]
diff --git a/packages/schemas/src/users.ts b/packages/schemas/src/users.ts
index 80286ce739c5..e17cd691d631 100644
--- a/packages/schemas/src/users.ts
+++ b/packages/schemas/src/users.ts
@@ -15,10 +15,12 @@ import { CustomThemeColorsSchema, FunboxNameSchema } from "./configs";
 import { doesNotContainDisallowedWords } from "./validation/validation";
 import { ConnectionSchema } from "./connections";
 
+export const ResultFilterPresetNameSchema = slug().max(16);
+
 const NoneFilterSchema = z.literal("none");
 export const ResultFiltersSchema = z.object({
   _id: IdSchema,
-  name: slug().max(16),
+  name: ResultFilterPresetNameSchema,
   pb: z
     .object({
       no: z.boolean(),
@@ -56,6 +58,7 @@ export const ResultFiltersSchema = z.object({
   funbox: z.record(FunboxNameSchema.or(NoneFilterSchema), z.boolean()),
 });
 export type ResultFilters = z.infer<typeof ResultFiltersSchema>;
+export type ResultFiltersKeys = keyof Omit<ResultFilters, "_id" | "name">;
 
 export const StreakHourOffsetSchema = z.number().min(-11).max(12).step(0.5);
 export type StreakHourOffset = z.infer<typeof StreakHourOffsetSchema>;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 18225be6a77b..77e98b7f1bd5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -322,29 +322,29 @@ importers:
         specifier: 0.2.1
         version: 0.2.1
       '@tanstack/query-db-collection':
-        specifier: 1.0.27
-        version: 1.0.27(@tanstack/query-core@5.90.20)(typescript@6.0.2)
+        specifier: 1.0.36
+        version: 1.0.36(@tanstack/query-core@5.100.3)(typescript@6.0.2)
       '@tanstack/solid-db':
-        specifier: 0.2.10
-        version: 0.2.10(solid-js@1.9.10)(typescript@6.0.2)
+        specifier: 0.2.19
+        version: 0.2.19(solid-js@1.9.10)(typescript@6.0.2)
       '@tanstack/solid-devtools':
-        specifier: 0.8.0
-        version: 0.8.0(csstype@3.2.3)(solid-js@1.9.10)
+        specifier: 0.8.2
+        version: 0.8.2(csstype@3.2.3)(solid-js@1.9.10)
       '@tanstack/solid-form':
-        specifier: 1.28.4
-        version: 1.28.4(solid-js@1.9.10)
+        specifier: 1.29.1
+        version: 1.29.1(solid-js@1.9.10)
       '@tanstack/solid-hotkeys':
-        specifier: 0.4.2
-        version: 0.4.2(solid-js@1.9.10)
+        specifier: 0.9.1
+        version: 0.9.1(solid-js@1.9.10)
       '@tanstack/solid-hotkeys-devtools':
-        specifier: 0.4.3
-        version: 0.4.3(@tanstack/hotkeys@0.4.2)(@types/react@19.2.14)(csstype@3.2.3)(react@18.3.1)(solid-js@1.9.10)
+        specifier: 0.6.6
+        version: 0.6.6(@tanstack/hotkeys@0.7.1)(@types/react@19.2.14)(csstype@3.2.3)(react@18.3.1)(solid-js@1.9.10)
       '@tanstack/solid-query':
-        specifier: 5.90.23
-        version: 5.90.23(solid-js@1.9.10)
+        specifier: 5.100.3
+        version: 5.100.3(solid-js@1.9.10)
       '@tanstack/solid-query-devtools':
-        specifier: 5.91.3
-        version: 5.91.3(@tanstack/solid-query@5.90.23(solid-js@1.9.10))(solid-js@1.9.10)
+        specifier: 5.100.3
+        version: 5.100.3(@tanstack/solid-query@5.100.3(solid-js@1.9.10))(solid-js@1.9.10)
       '@tanstack/solid-table':
         specifier: 8.21.3
         version: 8.21.3(solid-js@1.9.10)
@@ -370,8 +370,8 @@ importers:
         specifier: 2.2.1
         version: 2.2.1(chart.js@3.7.1)
       chartjs-plugin-trendline:
-        specifier: 3.2.0
-        version: 3.2.0
+        specifier: 3.2.4
+        version: 3.2.4
       clsx:
         specifier: 2.1.1
         version: 2.1.1
@@ -446,8 +446,8 @@ importers:
         specifier: 4.2.1
         version: 4.2.1(vite@8.0.5(@emnapi/core@1.9.0)(@emnapi/runtime@1.9.0)(@types/node@24.9.1)(esbuild@0.27.7)(jiti@2.6.1)(sass@1.70.0)(terser@5.46.2)(tsx@4.21.0)(yaml@2.8.3))
       '@tanstack/eslint-plugin-query':
-        specifier: 5.91.4
-        version: 5.91.4(eslint@9.39.1(jiti@2.6.1))(typescript@6.0.2)
+        specifier: 5.100.3
+        version: 5.100.3(eslint@9.39.1(jiti@2.6.1))(typescript@6.0.2)
       '@testing-library/dom':
         specifier: 10.4.1
         version: 10.4.1
@@ -677,7 +677,7 @@ importers:
         version: 6.0.2
       vitest:
         specifier: 4.1.0
-        version: 4.1.0(@types/node@24.9.1)(happy-dom@20.8.9)(jsdom@27.4.0)(vite@8.0.5(@emnapi/core@1.9.0)(@emnapi/runtime@1.9.0)(@types/node@24.9.1)(esbuild@0.25.11)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.2)(tsx@4.21.0)(yaml@2.8.3))
+        version: 4.1.0(@types/node@24.9.1)(happy-dom@20.8.9)(jsdom@27.4.0)(vite@8.0.5(@emnapi/core@1.9.0)(@emnapi/runtime@1.9.0)(@types/node@24.9.1)(esbuild@0.25.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.2)(tsx@4.21.0)(yaml@2.8.3))
 
   packages/funbox:
     dependencies:
@@ -867,6 +867,10 @@ packages:
   '@asamuzakjp/nwsapi@2.3.9':
     resolution: {integrity: sha512-n8GuYSrI9bF7FFZ/SjhwevlHc8xaVlb/7HmHelnc/PZXBD2ZR49NnN9sMMuDdEGPeeRQ5d0hqlSlEpgCX3Wl0Q==}
 
+  '@babel/code-frame@7.27.1':
+    resolution: {integrity: sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/code-frame@7.28.6':
     resolution: {integrity: sha512-JYgintcMjRiCvS8mMECzaEn+m3PfoQiyqukOMCCVQtoJGYJw8j/8LBJEiqkHLkfwCcs74E3pbAUFNg7d9VNJ+Q==}
     engines: {node: '>=6.9.0'}
@@ -875,6 +879,10 @@ packages:
     resolution: {integrity: sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/compat-data@7.28.5':
+    resolution: {integrity: sha512-6uFXyCayocRbqhZOB+6XcuZbkMNimwfVGFji8CTZnCzOHVGvDqzvitu1re2AU5LROliz7eQPhB8CpAMvnx9EjA==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/compat-data@7.28.6':
     resolution: {integrity: sha512-2lfu57JtzctfIrcGMz992hyLlByuzgIk58+hhGCxjKZ3rWI82NnVLjXcaTqkI2NvlcvOskZaiZ5kjUALo3Lpxg==}
     engines: {node: '>=6.9.0'}
@@ -883,6 +891,10 @@ packages:
     resolution: {integrity: sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/core@7.28.5':
+    resolution: {integrity: sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/core@7.28.6':
     resolution: {integrity: sha512-H3mcG6ZDLTlYfaSNi0iOKkigqMFvkTKlGUYlD8GW7nNOYRrevuA46iTypPyv+06V3fEmvvazfntkBU34L0azAw==}
     engines: {node: '>=6.9.0'}
@@ -891,6 +903,10 @@ packages:
     resolution: {integrity: sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/generator@7.28.5':
+    resolution: {integrity: sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/generator@7.28.6':
     resolution: {integrity: sha512-lOoVRwADj8hjf7al89tvQ2a1lf53Z+7tiXMgpZJL3maQPDxh0DgLMN62B2MKUOFcoodBHLMbDM6WAbKgNy5Suw==}
     engines: {node: '>=6.9.0'}
@@ -903,6 +919,10 @@ packages:
     resolution: {integrity: sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-compilation-targets@7.27.2':
+    resolution: {integrity: sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-compilation-targets@7.28.6':
     resolution: {integrity: sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==}
     engines: {node: '>=6.9.0'}
@@ -936,10 +956,20 @@ packages:
     resolution: {integrity: sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-module-imports@7.27.1':
+    resolution: {integrity: sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-module-imports@7.28.6':
     resolution: {integrity: sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-module-transforms@7.28.3':
+    resolution: {integrity: sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
   '@babel/helper-module-transforms@7.28.6':
     resolution: {integrity: sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==}
     engines: {node: '>=6.9.0'}
@@ -986,6 +1016,10 @@ packages:
     resolution: {integrity: sha512-z+PwLziMNBeSQJonizz2AGnndLsP2DeGHIxDAn+wdHOGuo4Fo1x1HBPPXeE9TAOPHNNWQKCSlA2VZyYyyibDnQ==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helpers@7.28.4':
+    resolution: {integrity: sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helpers@7.28.6':
     resolution: {integrity: sha512-xOBvwq86HHdB7WUDTfKfT/Vuxh7gElQ+Sfti2Cy6yIWNW05P8iUslOVcZ4/sKbE+/jQaukQAdz/gf3724kYdqw==}
     engines: {node: '>=6.9.0'}
@@ -994,6 +1028,11 @@ packages:
     resolution: {integrity: sha512-HoGuUs4sCZNezVEKdVcwqmZN8GoHirLUcLaYVNBK2J0DadGtdcqgr3BCbvH8+XUo4NGjNl3VOtSjEKNzqfFgKw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/parser@7.28.5':
+    resolution: {integrity: sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+
   '@babel/parser@7.28.6':
     resolution: {integrity: sha512-TeR9zWR18BvbfPmGbLampPMW+uW1NZnJlRuuHso8i87QZNq2JRF9i6RgxRqtEq+wQGsS19NNTWr2duhnE49mfQ==}
     engines: {node: '>=6.0.0'}
@@ -1387,6 +1426,14 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0 || ^8.0.0-0 <8.0.0
 
+  '@babel/runtime@7.25.0':
+    resolution: {integrity: sha512-7dRy4DwXwtzBrPbZflqxnvfxLF8kdZXPkhymtDeFoFqE6ldzjQFgYTtYIFARcLEYDrqfBfYcZt1WqFxRoyC9Rw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/runtime@7.28.4':
+    resolution: {integrity: sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/runtime@7.28.6':
     resolution: {integrity: sha512-05WQkdpL9COIMz4LjTxGpPNCdlpyimKppYNoJ5Di5EUObifl8t4tuLuUBBZEpoLYOmfvIWrsp9fCl0HoPRVTdA==}
     engines: {node: '>=6.9.0'}
@@ -1395,10 +1442,18 @@ packages:
     resolution: {integrity: sha512-JiDShH45zKHWyGe4ZNVRrCjBz8Nh9TMmZG1kh4QTK8hCBTWBi8Da+i7s1fJw7/lYpM4ccepSNfqzZ/QvABBi5g==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/template@7.27.2':
+    resolution: {integrity: sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/template@7.28.6':
     resolution: {integrity: sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/traverse@7.28.5':
+    resolution: {integrity: sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/traverse@7.28.6':
     resolution: {integrity: sha512-fgWX62k02qtjqdSNTAGxmKYY/7FSL9WAS1o2Hu5+I5m9T0yxZzr4cnrfXQ/MX0rIifthCSs6FKTlzYbJcPtMNg==}
     engines: {node: '>=6.9.0'}
@@ -1407,6 +1462,10 @@ packages:
     resolution: {integrity: sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/types@7.28.5':
+    resolution: {integrity: sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/types@7.28.6':
     resolution: {integrity: sha512-0ZrskXVEHSWIqZM/sQZ4EV3jZJXRkio/WCxaqKZP1g//CEWEPSfeZFcms4XeKBCHU0ZKnIkdJeU/kF+eRp5lBg==}
     engines: {node: '>=6.9.0'}
@@ -1648,6 +1707,12 @@ packages:
     engines: {node: '>=4'}
     deprecated: Support for this package will stop 2025-12-31
 
+  '@esbuild/aix-ppc64@0.25.0':
+    resolution: {integrity: sha512-O7vun9Sf8DFjH2UtqK8Ku3LkquL9SZL8OLY1T5NZkA34+wG3OQF7cl4Ql8vdNzM6fzBbYfLaiRLIOZ+2FOCgBQ==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [aix]
+
   '@esbuild/aix-ppc64@0.25.11':
     resolution: {integrity: sha512-Xt1dOL13m8u0WE8iplx9Ibbm+hFAO0GsU2P34UNoDGvZYkY8ifSiy6Zuc1lYxfG7svWE2fzqCUmFp5HCn51gJg==}
     engines: {node: '>=18'}
@@ -1666,6 +1731,12 @@ packages:
     cpu: [ppc64]
     os: [aix]
 
+  '@esbuild/android-arm64@0.25.0':
+    resolution: {integrity: sha512-grvv8WncGjDSyUBjN9yHXNt+cq0snxXbDxy5pJtzMKGmmpPxeAmAhWxXI+01lU5rwZomDgD3kJwulEnhTRUd6g==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [android]
+
   '@esbuild/android-arm64@0.25.11':
     resolution: {integrity: sha512-9slpyFBc4FPPz48+f6jyiXOx/Y4v34TUeDDXJpZqAWQn/08lKGeD8aDp9TMn9jDz2CiEuHwfhRmGBvpnd/PWIQ==}
     engines: {node: '>=18'}
@@ -1684,6 +1755,12 @@ packages:
     cpu: [arm64]
     os: [android]
 
+  '@esbuild/android-arm@0.25.0':
+    resolution: {integrity: sha512-PTyWCYYiU0+1eJKmw21lWtC+d08JDZPQ5g+kFyxP0V+es6VPPSUhM6zk8iImp2jbV6GwjX4pap0JFbUQN65X1g==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [android]
+
   '@esbuild/android-arm@0.25.11':
     resolution: {integrity: sha512-uoa7dU+Dt3HYsethkJ1k6Z9YdcHjTrSb5NUy66ZfZaSV8hEYGD5ZHbEMXnqLFlbBflLsl89Zke7CAdDJ4JI+Gg==}
     engines: {node: '>=18'}
@@ -1702,6 +1779,12 @@ packages:
     cpu: [arm]
     os: [android]
 
+  '@esbuild/android-x64@0.25.0':
+    resolution: {integrity: sha512-m/ix7SfKG5buCnxasr52+LI78SQ+wgdENi9CqyCXwjVR2X4Jkz+BpC3le3AoBPYTC9NHklwngVXvbJ9/Akhrfg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [android]
+
   '@esbuild/android-x64@0.25.11':
     resolution: {integrity: sha512-Sgiab4xBjPU1QoPEIqS3Xx+R2lezu0LKIEcYe6pftr56PqPygbB7+szVnzoShbx64MUupqoE0KyRlN7gezbl8g==}
     engines: {node: '>=18'}
@@ -1720,6 +1803,12 @@ packages:
     cpu: [x64]
     os: [android]
 
+  '@esbuild/darwin-arm64@0.25.0':
+    resolution: {integrity: sha512-mVwdUb5SRkPayVadIOI78K7aAnPamoeFR2bT5nszFUZ9P8UpK4ratOdYbZZXYSqPKMHfS1wdHCJk1P1EZpRdvw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [darwin]
+
   '@esbuild/darwin-arm64@0.25.11':
     resolution: {integrity: sha512-VekY0PBCukppoQrycFxUqkCojnTQhdec0vevUL/EDOCnXd9LKWqD/bHwMPzigIJXPhC59Vd1WFIL57SKs2mg4w==}
     engines: {node: '>=18'}
@@ -1738,6 +1827,12 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
+  '@esbuild/darwin-x64@0.25.0':
+    resolution: {integrity: sha512-DgDaYsPWFTS4S3nWpFcMn/33ZZwAAeAFKNHNa1QN0rI4pUjgqf0f7ONmXf6d22tqTY+H9FNdgeaAa+YIFUn2Rg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [darwin]
+
   '@esbuild/darwin-x64@0.25.11':
     resolution: {integrity: sha512-+hfp3yfBalNEpTGp9loYgbknjR695HkqtY3d3/JjSRUyPg/xd6q+mQqIb5qdywnDxRZykIHs3axEqU6l1+oWEQ==}
     engines: {node: '>=18'}
@@ -1756,6 +1851,12 @@ packages:
     cpu: [x64]
     os: [darwin]
 
+  '@esbuild/freebsd-arm64@0.25.0':
+    resolution: {integrity: sha512-VN4ocxy6dxefN1MepBx/iD1dH5K8qNtNe227I0mnTRjry8tj5MRk4zprLEdG8WPyAPb93/e4pSgi1SoHdgOa4w==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [freebsd]
+
   '@esbuild/freebsd-arm64@0.25.11':
     resolution: {integrity: sha512-CmKjrnayyTJF2eVuO//uSjl/K3KsMIeYeyN7FyDBjsR3lnSJHaXlVoAK8DZa7lXWChbuOk7NjAc7ygAwrnPBhA==}
     engines: {node: '>=18'}
@@ -1774,6 +1875,12 @@ packages:
     cpu: [arm64]
     os: [freebsd]
 
+  '@esbuild/freebsd-x64@0.25.0':
+    resolution: {integrity: sha512-mrSgt7lCh07FY+hDD1TxiTyIHyttn6vnjesnPoVDNmDfOmggTLXRv8Id5fNZey1gl/V2dyVK1VXXqVsQIiAk+A==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [freebsd]
+
   '@esbuild/freebsd-x64@0.25.11':
     resolution: {integrity: sha512-Dyq+5oscTJvMaYPvW3x3FLpi2+gSZTCE/1ffdwuM6G1ARang/mb3jvjxs0mw6n3Lsw84ocfo9CrNMqc5lTfGOw==}
     engines: {node: '>=18'}
@@ -1792,6 +1899,12 @@ packages:
     cpu: [x64]
     os: [freebsd]
 
+  '@esbuild/linux-arm64@0.25.0':
+    resolution: {integrity: sha512-9QAQjTWNDM/Vk2bgBl17yWuZxZNQIF0OUUuPZRKoDtqF2k4EtYbpyiG5/Dk7nqeK6kIJWPYldkOcBqjXjrUlmg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [linux]
+
   '@esbuild/linux-arm64@0.25.11':
     resolution: {integrity: sha512-Qr8AzcplUhGvdyUF08A1kHU3Vr2O88xxP0Tm8GcdVOUm25XYcMPp2YqSVHbLuXzYQMf9Bh/iKx7YPqECs6ffLA==}
     engines: {node: '>=18'}
@@ -1810,6 +1923,12 @@ packages:
     cpu: [arm64]
     os: [linux]
 
+  '@esbuild/linux-arm@0.25.0':
+    resolution: {integrity: sha512-vkB3IYj2IDo3g9xX7HqhPYxVkNQe8qTK55fraQyTzTX/fxaDtXiEnavv9geOsonh2Fd2RMB+i5cbhu2zMNWJwg==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [linux]
+
   '@esbuild/linux-arm@0.25.11':
     resolution: {integrity: sha512-TBMv6B4kCfrGJ8cUPo7vd6NECZH/8hPpBHHlYI3qzoYFvWu2AdTvZNuU/7hsbKWqu/COU7NIK12dHAAqBLLXgw==}
     engines: {node: '>=18'}
@@ -1828,6 +1947,12 @@ packages:
     cpu: [arm]
     os: [linux]
 
+  '@esbuild/linux-ia32@0.25.0':
+    resolution: {integrity: sha512-43ET5bHbphBegyeqLb7I1eYn2P/JYGNmzzdidq/w0T8E2SsYL1U6un2NFROFRg1JZLTzdCoRomg8Rvf9M6W6Gg==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [linux]
+
   '@esbuild/linux-ia32@0.25.11':
     resolution: {integrity: sha512-TmnJg8BMGPehs5JKrCLqyWTVAvielc615jbkOirATQvWWB1NMXY77oLMzsUjRLa0+ngecEmDGqt5jiDC6bfvOw==}
     engines: {node: '>=18'}
@@ -1846,6 +1971,12 @@ packages:
     cpu: [ia32]
     os: [linux]
 
+  '@esbuild/linux-loong64@0.25.0':
+    resolution: {integrity: sha512-fC95c/xyNFueMhClxJmeRIj2yrSMdDfmqJnyOY4ZqsALkDrrKJfIg5NTMSzVBr5YW1jf+l7/cndBfP3MSDpoHw==}
+    engines: {node: '>=18'}
+    cpu: [loong64]
+    os: [linux]
+
   '@esbuild/linux-loong64@0.25.11':
     resolution: {integrity: sha512-DIGXL2+gvDaXlaq8xruNXUJdT5tF+SBbJQKbWy/0J7OhU8gOHOzKmGIlfTTl6nHaCOoipxQbuJi7O++ldrxgMw==}
     engines: {node: '>=18'}
@@ -1864,6 +1995,12 @@ packages:
     cpu: [loong64]
     os: [linux]
 
+  '@esbuild/linux-mips64el@0.25.0':
+    resolution: {integrity: sha512-nkAMFju7KDW73T1DdH7glcyIptm95a7Le8irTQNO/qtkoyypZAnjchQgooFUDQhNAy4iu08N79W4T4pMBwhPwQ==}
+    engines: {node: '>=18'}
+    cpu: [mips64el]
+    os: [linux]
+
   '@esbuild/linux-mips64el@0.25.11':
     resolution: {integrity: sha512-Osx1nALUJu4pU43o9OyjSCXokFkFbyzjXb6VhGIJZQ5JZi8ylCQ9/LFagolPsHtgw6himDSyb5ETSfmp4rpiKQ==}
     engines: {node: '>=18'}
@@ -1882,6 +2019,12 @@ packages:
     cpu: [mips64el]
     os: [linux]
 
+  '@esbuild/linux-ppc64@0.25.0':
+    resolution: {integrity: sha512-NhyOejdhRGS8Iwv+KKR2zTq2PpysF9XqY+Zk77vQHqNbo/PwZCzB5/h7VGuREZm1fixhs4Q/qWRSi5zmAiO4Fw==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [linux]
+
   '@esbuild/linux-ppc64@0.25.11':
     resolution: {integrity: sha512-nbLFgsQQEsBa8XSgSTSlrnBSrpoWh7ioFDUmwo158gIm5NNP+17IYmNWzaIzWmgCxq56vfr34xGkOcZ7jX6CPw==}
     engines: {node: '>=18'}
@@ -1900,6 +2043,12 @@ packages:
     cpu: [ppc64]
     os: [linux]
 
+  '@esbuild/linux-riscv64@0.25.0':
+    resolution: {integrity: sha512-5S/rbP5OY+GHLC5qXp1y/Mx//e92L1YDqkiBbO9TQOvuFXM+iDqUNG5XopAnXoRH3FjIUDkeGcY1cgNvnXp/kA==}
+    engines: {node: '>=18'}
+    cpu: [riscv64]
+    os: [linux]
+
   '@esbuild/linux-riscv64@0.25.11':
     resolution: {integrity: sha512-HfyAmqZi9uBAbgKYP1yGuI7tSREXwIb438q0nqvlpxAOs3XnZ8RsisRfmVsgV486NdjD7Mw2UrFSw51lzUk1ww==}
     engines: {node: '>=18'}
@@ -1918,6 +2067,12 @@ packages:
     cpu: [riscv64]
     os: [linux]
 
+  '@esbuild/linux-s390x@0.25.0':
+    resolution: {integrity: sha512-XM2BFsEBz0Fw37V0zU4CXfcfuACMrppsMFKdYY2WuTS3yi8O1nFOhil/xhKTmE1nPmVyvQJjJivgDT+xh8pXJA==}
+    engines: {node: '>=18'}
+    cpu: [s390x]
+    os: [linux]
+
   '@esbuild/linux-s390x@0.25.11':
     resolution: {integrity: sha512-HjLqVgSSYnVXRisyfmzsH6mXqyvj0SA7pG5g+9W7ESgwA70AXYNpfKBqh1KbTxmQVaYxpzA/SvlB9oclGPbApw==}
     engines: {node: '>=18'}
@@ -1936,6 +2091,12 @@ packages:
     cpu: [s390x]
     os: [linux]
 
+  '@esbuild/linux-x64@0.25.0':
+    resolution: {integrity: sha512-9yl91rHw/cpwMCNytUDxwj2XjFpxML0y9HAOH9pNVQDpQrBxHy01Dx+vaMu0N1CKa/RzBD2hB4u//nfc+Sd3Cw==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [linux]
+
   '@esbuild/linux-x64@0.25.11':
     resolution: {integrity: sha512-HSFAT4+WYjIhrHxKBwGmOOSpphjYkcswF449j6EjsjbinTZbp8PJtjsVK1XFJStdzXdy/jaddAep2FGY+wyFAQ==}
     engines: {node: '>=18'}
@@ -1954,6 +2115,12 @@ packages:
     cpu: [x64]
     os: [linux]
 
+  '@esbuild/netbsd-arm64@0.25.0':
+    resolution: {integrity: sha512-RuG4PSMPFfrkH6UwCAqBzauBWTygTvb1nxWasEJooGSJ/NwRw7b2HOwyRTQIU97Hq37l3npXoZGYMy3b3xYvPw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [netbsd]
+
   '@esbuild/netbsd-arm64@0.25.11':
     resolution: {integrity: sha512-hr9Oxj1Fa4r04dNpWr3P8QKVVsjQhqrMSUzZzf+LZcYjZNqhA3IAfPQdEh1FLVUJSiu6sgAwp3OmwBfbFgG2Xg==}
     engines: {node: '>=18'}
@@ -1972,6 +2139,12 @@ packages:
     cpu: [arm64]
     os: [netbsd]
 
+  '@esbuild/netbsd-x64@0.25.0':
+    resolution: {integrity: sha512-jl+qisSB5jk01N5f7sPCsBENCOlPiS/xptD5yxOx2oqQfyourJwIKLRA2yqWdifj3owQZCL2sn6o08dBzZGQzA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [netbsd]
+
   '@esbuild/netbsd-x64@0.25.11':
     resolution: {integrity: sha512-u7tKA+qbzBydyj0vgpu+5h5AeudxOAGncb8N6C9Kh1N4n7wU1Xw1JDApsRjpShRpXRQlJLb9wY28ELpwdPcZ7A==}
     engines: {node: '>=18'}
@@ -1990,6 +2163,12 @@ packages:
     cpu: [x64]
     os: [netbsd]
 
+  '@esbuild/openbsd-arm64@0.25.0':
+    resolution: {integrity: sha512-21sUNbq2r84YE+SJDfaQRvdgznTD8Xc0oc3p3iW/a1EVWeNj/SdUCbm5U0itZPQYRuRTW20fPMWMpcrciH2EJw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openbsd]
+
   '@esbuild/openbsd-arm64@0.25.11':
     resolution: {integrity: sha512-Qq6YHhayieor3DxFOoYM1q0q1uMFYb7cSpLD2qzDSvK1NAvqFi8Xgivv0cFC6J+hWVw2teCYltyy9/m/14ryHg==}
     engines: {node: '>=18'}
@@ -2008,6 +2187,12 @@ packages:
     cpu: [arm64]
     os: [openbsd]
 
+  '@esbuild/openbsd-x64@0.25.0':
+    resolution: {integrity: sha512-2gwwriSMPcCFRlPlKx3zLQhfN/2WjJ2NSlg5TKLQOJdV0mSxIcYNTMhk3H3ulL/cak+Xj0lY1Ym9ysDV1igceg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [openbsd]
+
   '@esbuild/openbsd-x64@0.25.11':
     resolution: {integrity: sha512-CN+7c++kkbrckTOz5hrehxWN7uIhFFlmS/hqziSFVWpAzpWrQoAG4chH+nN3Be+Kzv/uuo7zhX716x3Sn2Jduw==}
     engines: {node: '>=18'}
@@ -2044,6 +2229,12 @@ packages:
     cpu: [arm64]
     os: [openharmony]
 
+  '@esbuild/sunos-x64@0.25.0':
+    resolution: {integrity: sha512-bxI7ThgLzPrPz484/S9jLlvUAHYMzy6I0XiU1ZMeAEOBcS0VePBFxh1JjTQt3Xiat5b6Oh4x7UC7IwKQKIJRIg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [sunos]
+
   '@esbuild/sunos-x64@0.25.11':
     resolution: {integrity: sha512-nq2xdYaWxyg9DcIyXkZhcYulC6pQ2FuCgem3LI92IwMgIZ69KHeY8T4Y88pcwoLIjbed8n36CyKoYRDygNSGhA==}
     engines: {node: '>=18'}
@@ -2062,6 +2253,12 @@ packages:
     cpu: [x64]
     os: [sunos]
 
+  '@esbuild/win32-arm64@0.25.0':
+    resolution: {integrity: sha512-ZUAc2YK6JW89xTbXvftxdnYy3m4iHIkDtK3CLce8wg8M2L+YZhIvO1DKpxrd0Yr59AeNNkTiic9YLf6FTtXWMw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [win32]
+
   '@esbuild/win32-arm64@0.25.11':
     resolution: {integrity: sha512-3XxECOWJq1qMZ3MN8srCJ/QfoLpL+VaxD/WfNRm1O3B4+AZ/BnLVgFbUV3eiRYDMXetciH16dwPbbHqwe1uU0Q==}
     engines: {node: '>=18'}
@@ -2080,6 +2277,12 @@ packages:
     cpu: [arm64]
     os: [win32]
 
+  '@esbuild/win32-ia32@0.25.0':
+    resolution: {integrity: sha512-eSNxISBu8XweVEWG31/JzjkIGbGIJN/TrRoiSVZwZ6pkC6VX4Im/WV2cz559/TXLcYbcrDN8JtKgd9DJVIo8GA==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [win32]
+
   '@esbuild/win32-ia32@0.25.11':
     resolution: {integrity: sha512-3ukss6gb9XZ8TlRyJlgLn17ecsK4NSQTmdIXRASVsiS2sQ6zPPZklNJT5GR5tE/MUarymmy8kCEf5xPCNCqVOA==}
     engines: {node: '>=18'}
@@ -2098,6 +2301,12 @@ packages:
     cpu: [ia32]
     os: [win32]
 
+  '@esbuild/win32-x64@0.25.0':
+    resolution: {integrity: sha512-ZENoHJBxA20C2zFzh6AI4fT6RraMzjYw4xKWemRTRmRVtN9c5DcH9r/f2ihEkMjOW5eGgrwCslG/+Y/3bL+DHQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [win32]
+
   '@esbuild/win32-x64@0.25.11':
     resolution: {integrity: sha512-D7Hpz6A2L4hzsRpPaCYkQnGOotdUpDzSGRIv9I+1ITdHROSFUWW95ZPZWQmGka1Fg7W3zFJowyn9WGwMJ0+KPA==}
     engines: {node: '>=18'}
@@ -2116,6 +2325,12 @@ packages:
     cpu: [x64]
     os: [win32]
 
+  '@eslint-community/eslint-utils@4.9.0':
+    resolution: {integrity: sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+
   '@eslint-community/eslint-utils@4.9.1':
     resolution: {integrity: sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -2639,6 +2854,12 @@ packages:
   '@jridgewell/source-map@0.3.11':
     resolution: {integrity: sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==}
 
+  '@jridgewell/source-map@0.3.6':
+    resolution: {integrity: sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==}
+
+  '@jridgewell/sourcemap-codec@1.5.0':
+    resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==}
+
   '@jridgewell/sourcemap-codec@1.5.5':
     resolution: {integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==}
 
@@ -3459,8 +3680,8 @@ packages:
       rollup:
         optional: true
 
-  '@rollup/rollup-android-arm-eabi@4.52.5':
-    resolution: {integrity: sha512-8c1vW4ocv3UOMp9K+gToY5zL2XiiVw3k7f1ksf4yO1FlDFQ1C2u72iACFnSOceJFsWskc2WZNqeRhFRPzv+wtQ==}
+  '@rollup/rollup-android-arm-eabi@4.40.0':
+    resolution: {integrity: sha512-+Fbls/diZ0RDerhE8kyC6hjADCXA1K4yVNlH0EYfd2XjyH0UGgzaQ8MlT0pCXAThfxv3QUAczHaL+qSv1E4/Cg==}
     cpu: [arm]
     os: [android]
 
@@ -3469,8 +3690,8 @@ packages:
     cpu: [arm]
     os: [android]
 
-  '@rollup/rollup-android-arm64@4.52.5':
-    resolution: {integrity: sha512-mQGfsIEFcu21mvqkEKKu2dYmtuSZOBMmAl5CFlPGLY94Vlcm+zWApK7F/eocsNzp8tKmbeBP8yXyAbx0XHsFNA==}
+  '@rollup/rollup-android-arm64@4.40.0':
+    resolution: {integrity: sha512-PPA6aEEsTPRz+/4xxAmaoWDqh67N7wFbgFUJGMnanCFs0TV99M0M8QhhaSCks+n6EbQoFvLQgYOGXxlMGQe/6w==}
     cpu: [arm64]
     os: [android]
 
@@ -3479,8 +3700,8 @@ packages:
     cpu: [arm64]
     os: [android]
 
-  '@rollup/rollup-darwin-arm64@4.52.5':
-    resolution: {integrity: sha512-takF3CR71mCAGA+v794QUZ0b6ZSrgJkArC+gUiG6LB6TQty9T0Mqh3m2ImRBOxS2IeYBo4lKWIieSvnEk2OQWA==}
+  '@rollup/rollup-darwin-arm64@4.40.0':
+    resolution: {integrity: sha512-GwYOcOakYHdfnjjKwqpTGgn5a6cUX7+Ra2HeNj/GdXvO2VJOOXCiYYlRFU4CubFM67EhbmzLOmACKEfvp3J1kQ==}
     cpu: [arm64]
     os: [darwin]
 
@@ -3489,8 +3710,8 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
-  '@rollup/rollup-darwin-x64@4.52.5':
-    resolution: {integrity: sha512-W901Pla8Ya95WpxDn//VF9K9u2JbocwV/v75TE0YIHNTbhqUTv9w4VuQ9MaWlNOkkEfFwkdNhXgcLqPSmHy0fA==}
+  '@rollup/rollup-darwin-x64@4.40.0':
+    resolution: {integrity: sha512-CoLEGJ+2eheqD9KBSxmma6ld01czS52Iw0e2qMZNpPDlf7Z9mj8xmMemxEucinev4LgHalDPczMyxzbq+Q+EtA==}
     cpu: [x64]
     os: [darwin]
 
@@ -3499,8 +3720,8 @@ packages:
     cpu: [x64]
     os: [darwin]
 
-  '@rollup/rollup-freebsd-arm64@4.52.5':
-    resolution: {integrity: sha512-QofO7i7JycsYOWxe0GFqhLmF6l1TqBswJMvICnRUjqCx8b47MTo46W8AoeQwiokAx3zVryVnxtBMcGcnX12LvA==}
+  '@rollup/rollup-freebsd-arm64@4.40.0':
+    resolution: {integrity: sha512-r7yGiS4HN/kibvESzmrOB/PxKMhPTlz+FcGvoUIKYoTyGd5toHp48g1uZy1o1xQvybwwpqpe010JrcGG2s5nkg==}
     cpu: [arm64]
     os: [freebsd]
 
@@ -3509,8 +3730,8 @@ packages:
     cpu: [arm64]
     os: [freebsd]
 
-  '@rollup/rollup-freebsd-x64@4.52.5':
-    resolution: {integrity: sha512-jr21b/99ew8ujZubPo9skbrItHEIE50WdV86cdSoRkKtmWa+DDr6fu2c/xyRT0F/WazZpam6kk7IHBerSL7LDQ==}
+  '@rollup/rollup-freebsd-x64@4.40.0':
+    resolution: {integrity: sha512-mVDxzlf0oLzV3oZOr0SMJ0lSDd3xC4CmnWJ8Val8isp9jRGl5Dq//LLDSPFrasS7pSm6m5xAcKaw3sHXhBjoRw==}
     cpu: [x64]
     os: [freebsd]
 
@@ -3519,8 +3740,8 @@ packages:
     cpu: [x64]
     os: [freebsd]
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.52.5':
-    resolution: {integrity: sha512-PsNAbcyv9CcecAUagQefwX8fQn9LQ4nZkpDboBOttmyffnInRy8R8dSg6hxxl2Re5QhHBf6FYIDhIj5v982ATQ==}
+  '@rollup/rollup-linux-arm-gnueabihf@4.40.0':
+    resolution: {integrity: sha512-y/qUMOpJxBMy8xCXD++jeu8t7kzjlOCkoxxajL58G62PJGBZVl/Gwpm7JK9+YvlB701rcQTzjUZ1JgUoPTnoQA==}
     cpu: [arm]
     os: [linux]
 
@@ -3529,8 +3750,8 @@ packages:
     cpu: [arm]
     os: [linux]
 
-  '@rollup/rollup-linux-arm-musleabihf@4.52.5':
-    resolution: {integrity: sha512-Fw4tysRutyQc/wwkmcyoqFtJhh0u31K+Q6jYjeicsGJJ7bbEq8LwPWV/w0cnzOqR2m694/Af6hpFayLJZkG2VQ==}
+  '@rollup/rollup-linux-arm-musleabihf@4.40.0':
+    resolution: {integrity: sha512-GoCsPibtVdJFPv/BOIvBKO/XmwZLwaNWdyD8TKlXuqp0veo2sHE+A/vpMQ5iSArRUz/uaoj4h5S6Pn0+PdhRjg==}
     cpu: [arm]
     os: [linux]
 
@@ -3539,8 +3760,8 @@ packages:
     cpu: [arm]
     os: [linux]
 
-  '@rollup/rollup-linux-arm64-gnu@4.52.5':
-    resolution: {integrity: sha512-a+3wVnAYdQClOTlyapKmyI6BLPAFYs0JM8HRpgYZQO02rMR09ZcV9LbQB+NL6sljzG38869YqThrRnfPMCDtZg==}
+  '@rollup/rollup-linux-arm64-gnu@4.40.0':
+    resolution: {integrity: sha512-L5ZLphTjjAD9leJzSLI7rr8fNqJMlGDKlazW2tX4IUF9P7R5TMQPElpH82Q7eNIDQnQlAyiNVfRPfP2vM5Avvg==}
     cpu: [arm64]
     os: [linux]
 
@@ -3549,8 +3770,8 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@rollup/rollup-linux-arm64-musl@4.52.5':
-    resolution: {integrity: sha512-AvttBOMwO9Pcuuf7m9PkC1PUIKsfaAJ4AYhy944qeTJgQOqJYJ9oVl2nYgY7Rk0mkbsuOpCAYSs6wLYB2Xiw0Q==}
+  '@rollup/rollup-linux-arm64-musl@4.40.0':
+    resolution: {integrity: sha512-ATZvCRGCDtv1Y4gpDIXsS+wfFeFuLwVxyUBSLawjgXK2tRE6fnsQEkE4csQQYWlBlsFztRzCnBvWVfcae/1qxQ==}
     cpu: [arm64]
     os: [linux]
 
@@ -3559,11 +3780,6 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@rollup/rollup-linux-loong64-gnu@4.52.5':
-    resolution: {integrity: sha512-DkDk8pmXQV2wVrF6oq5tONK6UHLz/XcEVow4JTTerdeV1uqPeHxwcg7aFsfnSm9L+OO8WJsWotKM2JJPMWrQtA==}
-    cpu: [loong64]
-    os: [linux]
-
   '@rollup/rollup-linux-loong64-gnu@4.60.1':
     resolution: {integrity: sha512-VSvgvQeIcsEvY4bKDHEDWcpW4Yw7BtlKG1GUT4FzBUlEKQK0rWHYBqQt6Fm2taXS+1bXvJT6kICu5ZwqKCnvlQ==}
     cpu: [loong64]
@@ -3574,8 +3790,13 @@ packages:
     cpu: [loong64]
     os: [linux]
 
-  '@rollup/rollup-linux-ppc64-gnu@4.52.5':
-    resolution: {integrity: sha512-W/b9ZN/U9+hPQVvlGwjzi+Wy4xdoH2I8EjaCkMvzpI7wJUs8sWJ03Rq96jRnHkSrcHTpQe8h5Tg3ZzUPGauvAw==}
+  '@rollup/rollup-linux-loongarch64-gnu@4.40.0':
+    resolution: {integrity: sha512-wG9e2XtIhd++QugU5MD9i7OnpaVb08ji3P1y/hNbxrQ3sYEelKJOq1UJ5dXczeo6Hj2rfDEL5GdtkMSVLa/AOg==}
+    cpu: [loong64]
+    os: [linux]
+
+  '@rollup/rollup-linux-powerpc64le-gnu@4.40.0':
+    resolution: {integrity: sha512-vgXfWmj0f3jAUvC7TZSU/m/cOE558ILWDzS7jBhiCAFpY2WEBn5jqgbqvmzlMjtp8KlLcBlXVD2mkTSEQE6Ixw==}
     cpu: [ppc64]
     os: [linux]
 
@@ -3589,8 +3810,8 @@ packages:
     cpu: [ppc64]
     os: [linux]
 
-  '@rollup/rollup-linux-riscv64-gnu@4.52.5':
-    resolution: {integrity: sha512-sjQLr9BW7R/ZiXnQiWPkErNfLMkkWIoCz7YMn27HldKsADEKa5WYdobaa1hmN6slu9oWQbB6/jFpJ+P2IkVrmw==}
+  '@rollup/rollup-linux-riscv64-gnu@4.40.0':
+    resolution: {integrity: sha512-uJkYTugqtPZBS3Z136arevt/FsKTF/J9dEMTX/cwR7lsAW4bShzI2R0pJVw+hcBTWF4dxVckYh72Hk3/hWNKvA==}
     cpu: [riscv64]
     os: [linux]
 
@@ -3599,8 +3820,8 @@ packages:
     cpu: [riscv64]
     os: [linux]
 
-  '@rollup/rollup-linux-riscv64-musl@4.52.5':
-    resolution: {integrity: sha512-hq3jU/kGyjXWTvAh2awn8oHroCbrPm8JqM7RUpKjalIRWWXE01CQOf/tUNWNHjmbMHg/hmNCwc/Pz3k1T/j/Lg==}
+  '@rollup/rollup-linux-riscv64-musl@4.40.0':
+    resolution: {integrity: sha512-rKmSj6EXQRnhSkE22+WvrqOqRtk733x3p5sWpZilhmjnkHkpeCgWsFFo0dGnUGeA+OZjRl3+VYq+HyCOEuwcxQ==}
     cpu: [riscv64]
     os: [linux]
 
@@ -3609,8 +3830,8 @@ packages:
     cpu: [riscv64]
     os: [linux]
 
-  '@rollup/rollup-linux-s390x-gnu@4.52.5':
-    resolution: {integrity: sha512-gn8kHOrku8D4NGHMK1Y7NA7INQTRdVOntt1OCYypZPRt6skGbddska44K8iocdpxHTMMNui5oH4elPH4QOLrFQ==}
+  '@rollup/rollup-linux-s390x-gnu@4.40.0':
+    resolution: {integrity: sha512-SpnYlAfKPOoVsQqmTFJ0usx0z84bzGOS9anAC0AZ3rdSo3snecihbhFTlJZ8XMwzqAcodjFU4+/SM311dqE5Sw==}
     cpu: [s390x]
     os: [linux]
 
@@ -3619,8 +3840,8 @@ packages:
     cpu: [s390x]
     os: [linux]
 
-  '@rollup/rollup-linux-x64-gnu@4.52.5':
-    resolution: {integrity: sha512-hXGLYpdhiNElzN770+H2nlx+jRog8TyynpTVzdlc6bndktjKWyZyiCsuDAlpd+j+W+WNqfcyAWz9HxxIGfZm1Q==}
+  '@rollup/rollup-linux-x64-gnu@4.40.0':
+    resolution: {integrity: sha512-RcDGMtqF9EFN8i2RYN2W+64CdHruJ5rPqrlYw+cgM3uOVPSsnAQps7cpjXe9be/yDp8UC7VLoCoKC8J3Kn2FkQ==}
     cpu: [x64]
     os: [linux]
 
@@ -3629,8 +3850,8 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@rollup/rollup-linux-x64-musl@4.52.5':
-    resolution: {integrity: sha512-arCGIcuNKjBoKAXD+y7XomR9gY6Mw7HnFBv5Rw7wQRvwYLR7gBAgV7Mb2QTyjXfTveBNFAtPt46/36vV9STLNg==}
+  '@rollup/rollup-linux-x64-musl@4.40.0':
+    resolution: {integrity: sha512-HZvjpiUmSNx5zFgwtQAV1GaGazT2RWvqeDi0hV+AtC8unqqDSsaFjPxfsO6qPtKRRg25SisACWnJ37Yio8ttaw==}
     cpu: [x64]
     os: [linux]
 
@@ -3644,18 +3865,13 @@ packages:
     cpu: [x64]
     os: [openbsd]
 
-  '@rollup/rollup-openharmony-arm64@4.52.5':
-    resolution: {integrity: sha512-QoFqB6+/9Rly/RiPjaomPLmR/13cgkIGfA40LHly9zcH1S0bN2HVFYk3a1eAyHQyjs3ZJYlXvIGtcCs5tko9Cw==}
-    cpu: [arm64]
-    os: [openharmony]
-
   '@rollup/rollup-openharmony-arm64@4.60.1':
     resolution: {integrity: sha512-4Cv23ZrONRbNtbZa37mLSueXUCtN7MXccChtKpUnQNgF010rjrjfHx3QxkS2PI7LqGT5xXyYs1a7LbzAwT0iCA==}
     cpu: [arm64]
     os: [openharmony]
 
-  '@rollup/rollup-win32-arm64-msvc@4.52.5':
-    resolution: {integrity: sha512-w0cDWVR6MlTstla1cIfOGyl8+qb93FlAVutcor14Gf5Md5ap5ySfQ7R9S/NjNaMLSFdUnKGEasmVnu3lCMqB7w==}
+  '@rollup/rollup-win32-arm64-msvc@4.40.0':
+    resolution: {integrity: sha512-UtZQQI5k/b8d7d3i9AZmA/t+Q4tk3hOC0tMOMSq2GlMYOfxbesxG4mJSeDp0EHs30N9bsfwUvs3zF4v/RzOeTQ==}
     cpu: [arm64]
     os: [win32]
 
@@ -3664,8 +3880,8 @@ packages:
     cpu: [arm64]
     os: [win32]
 
-  '@rollup/rollup-win32-ia32-msvc@4.52.5':
-    resolution: {integrity: sha512-Aufdpzp7DpOTULJCuvzqcItSGDH73pF3ko/f+ckJhxQyHtp67rHw3HMNxoIdDMUITJESNE6a8uh4Lo4SLouOUg==}
+  '@rollup/rollup-win32-ia32-msvc@4.40.0':
+    resolution: {integrity: sha512-+m03kvI2f5syIqHXCZLPVYplP8pQch9JHyXKZ3AGMKlg8dCyr2PKHjwRLiW53LTrN/Nc3EqHOKxUxzoSPdKddA==}
     cpu: [ia32]
     os: [win32]
 
@@ -3674,18 +3890,13 @@ packages:
     cpu: [ia32]
     os: [win32]
 
-  '@rollup/rollup-win32-x64-gnu@4.52.5':
-    resolution: {integrity: sha512-UGBUGPFp1vkj6p8wCRraqNhqwX/4kNQPS57BCFc8wYh0g94iVIW33wJtQAx3G7vrjjNtRaxiMUylM0ktp/TRSQ==}
-    cpu: [x64]
-    os: [win32]
-
   '@rollup/rollup-win32-x64-gnu@4.60.1':
     resolution: {integrity: sha512-k+600V9Zl1CM7eZxJgMyTUzmrmhB/0XZnF4pRypKAlAgxmedUA+1v9R+XOFv56W4SlHEzfeMtzujLJD22Uz5zg==}
     cpu: [x64]
     os: [win32]
 
-  '@rollup/rollup-win32-x64-msvc@4.52.5':
-    resolution: {integrity: sha512-TAcgQh2sSkykPRWLrdyy2AiceMckNf5loITqXxFI5VuQjS5tSuw3WlwdN8qv8vzjLAUTvYaH/mVjSFpbkFbpTg==}
+  '@rollup/rollup-win32-x64-msvc@4.40.0':
+    resolution: {integrity: sha512-lpPE1cLfP5oPzVjKMx10pgBmKELQnFJXHgvtHCtuJWOv8MxqdEIMNtgHgBFf7Ea2/7EuVwa9fodWUfXAlXZLZQ==}
     cpu: [x64]
     os: [win32]
 
@@ -3961,6 +4172,11 @@ packages:
     peerDependencies:
       solid-js: ^1.6.12
 
+  '@solid-primitives/utils@6.3.2':
+    resolution: {integrity: sha512-hZ/M/qr25QOCcwDPOHtGjxTD8w2mNyVAYvcfgwzBHq2RwNqHNdDNsMZYap20+ruRwW4A3Cdkczyoz0TSxLCAPQ==}
+    peerDependencies:
+      solid-js: ^1.6.12
+
   '@solid-primitives/utils@6.4.0':
     resolution: {integrity: sha512-AeGTBg8Wtkh/0s+evyLtP8piQoS4wyqqQaAFs2HJcFMMjYAtUgo+ZPduRXLjPlqKVc2ejeR544oeqpbn8Egn8A==}
     peerDependencies:
@@ -4159,13 +4375,13 @@ packages:
     peerDependencies:
       vite: ^5.2.0 || ^6 || ^7
 
-  '@tanstack/db-ivm@0.1.17':
-    resolution: {integrity: sha512-DK7vm56CDxNuRAdsbiPs+gITJ+16tUtYgZg3BRTLYKGIDsy8sdIO7sQFq5zl7Y+aIKAPmMAbVp9UjJ75FTtwgQ==}
+  '@tanstack/db-ivm@0.1.18':
+    resolution: {integrity: sha512-+pZJiRKdoKRM5Epq9T7otD9ZJl82pRFauo7LKuJGrarjVKQ7r+QQlPe3kGdN9LEKSnuNGIWjX9OOY4M8kH4eLw==}
     peerDependencies:
       typescript: '>=4.7'
 
-  '@tanstack/db@0.5.30':
-    resolution: {integrity: sha512-kgBbmGrWSrDdKPzl465OEGy2Epyc6HsoI2U/jUrMSHuGgUEtgowpnBCTyPJCGBrHL8+bYgASFV4ULsFn4L6pLg==}
+  '@tanstack/db@0.6.5':
+    resolution: {integrity: sha512-gtCuAo4UtC9SR/kTMu5fVEff6qZ2R1FZi9X7MybtHKA6wve7RePifGG6qBI4OmMB+7juT5/+glNbnqZOrG0/pg==}
     peerDependencies:
       typescript: '>=4.7'
 
@@ -4177,9 +4393,10 @@ packages:
     resolution: {integrity: sha512-cNnJ89Q021Zf883rlbBTfsaxTfi2r73/qejGtyTa7ksErF3hyDyAq1aTbo5crK9dAL7zSHh9viKY1BtMls1QOA==}
     engines: {node: '>=18'}
 
-  '@tanstack/devtools-event-client@0.4.1':
-    resolution: {integrity: sha512-GRxmPw4OHZ2oZeIEUkEwt/NDvuEqzEYRAjzUVMs+I0pd4C7k1ySOiuJK2CqF+K/yEAR3YZNkW3ExrpDarh9Vwg==}
+  '@tanstack/devtools-event-client@0.4.3':
+    resolution: {integrity: sha512-OZI6QyULw0FI0wjgmeYzCIfbgPsOEzwJtCpa69XrfLMtNXLGnz3d/dIabk7frg0TmHo+Ah49w5I4KC7Tufwsvw==}
     engines: {node: '>=18'}
+    hasBin: true
 
   '@tanstack/devtools-ui@0.5.1':
     resolution: {integrity: sha512-T9JjAdqMSnxsVO6AQykD5vhxPF4iFLKtbYxee/bU3OLlk446F5C1220GdCmhDSz7y4lx+m8AvIS0bq6zzvdDUA==}
@@ -4209,33 +4426,33 @@ packages:
       vue:
         optional: true
 
-  '@tanstack/devtools@0.11.0':
-    resolution: {integrity: sha512-ARRAnEm0HYjKlB2adC9YyDG3fbq5LVjpxPe6Jz583SanXRM1aKrZIGHIA//oRldX3mWIpM4kB6mCyd+CXCLqhA==}
+  '@tanstack/devtools@0.11.2':
+    resolution: {integrity: sha512-K8+tsBx+ptTLqqd4dOF10B6laj1g+XYImqYZL9n0jBINGaT+sOf17PKV9pbBt8kdbZeIGsHaJ5OZWCyZoHqN4A==}
     engines: {node: '>=18'}
     hasBin: true
     peerDependencies:
       solid-js: '>=1.9.7'
 
-  '@tanstack/eslint-plugin-query@5.91.4':
-    resolution: {integrity: sha512-8a+GAeR7oxJ5laNyYBQ6miPK09Hi18o5Oie/jx8zioXODv/AUFLZQecKabPdpQSLmuDXEBPKFh+W5DKbWlahjQ==}
+  '@tanstack/eslint-plugin-query@5.100.3':
+    resolution: {integrity: sha512-2f3F2vXksozICeoFWX/aXSyz7T1GOoyhS3BP3v0HplOfj42c37Gt6IRa8SL4QkeLUWdQ0fbrqeeyZ1z3JqxJIg==}
     peerDependencies:
-      eslint: ^8.57.0 || ^9.0.0
-      typescript: ^5.0.0
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: ^5.4.0 || ^6.0.0
     peerDependenciesMeta:
       typescript:
         optional: true
 
-  '@tanstack/form-core@1.28.4':
-    resolution: {integrity: sha512-2eox5ePrJ6kvA1DXD5QHk/GeGr3VFZ0uYR63UgQOe7bUg6h1JfXaIMqTjZK9sdGyE4oRNqFpoW54H0pZM7nObQ==}
+  '@tanstack/form-core@1.29.1':
+    resolution: {integrity: sha512-NIYPO36eEu7nSWvMpbFDQaBWyVtnH/C8fsZ3/XpJUT4uOWgmxsiUvHGbTbDNIQTXAKIkhwEl0sUrqBNn2SfUnw==}
 
-  '@tanstack/hotkeys-devtools@0.4.3':
-    resolution: {integrity: sha512-PdIQBau5qUHZnDi1jIeIyCBcT/ALW5FvpsWp5GD6PnIhdvseGnMfzLLAvZkc8zrD1eb6pjDRcwpsPY9ITZ0/3w==}
+  '@tanstack/hotkeys-devtools@0.8.1':
+    resolution: {integrity: sha512-zHPGBX0rhFz6iOVTYUdqxVVlpn5ER8rsUFYPWha+Zwzp90oZmUZjjdr/nE7K/6afr+WgR1UcwZIKXqDmGSRhPw==}
     engines: {node: '>=18'}
     peerDependencies:
-      '@tanstack/hotkeys': 0.4.2
+      '@tanstack/hotkeys': 0.7.1
 
-  '@tanstack/hotkeys@0.4.2':
-    resolution: {integrity: sha512-dCCu6Q91wZ2Mz7Vb+tzzpbKH0cSY9JXqJS7ZyouxewNL8oVmI228P9BmP94/1255g5WjPS+njenyrbWVeEQP5Q==}
+  '@tanstack/hotkeys@0.7.1':
+    resolution: {integrity: sha512-YHVO1z6wnvUCu7bg870Kv5k2D+FIuIOSIcbN0dAmTTsJ3mLMDLwcTVx0qVaq+SZp1B514JJTqGVstvUp85yIpQ==}
     engines: {node: '>=18'}
 
   '@tanstack/pacer-lite@0.1.1':
@@ -4246,59 +4463,59 @@ packages:
     resolution: {integrity: sha512-3PouiFjR4B6x1c969/Pl4ZIJleof1M0n6fNX8NRiC9Sqv1g06CVDlEaXUR4212ycGFyfq4q+t8Gi37Xy+z34iQ==}
     engines: {node: '>=18'}
 
-  '@tanstack/query-core@5.90.20':
-    resolution: {integrity: sha512-OMD2HLpNouXEfZJWcKeVKUgQ5n+n3A2JFmBaScpNDUqSrQSjiveC7dKMe53uJUg1nDG16ttFPz2xfilz6i2uVg==}
+  '@tanstack/query-core@5.100.3':
+    resolution: {integrity: sha512-oMO1imV4qStH+GqddafkI7Q7r2ktPL7/0Mu74W1XEhfHHd3oTIrwP3OOIsbtpnnbe8y/IU+8Lm7Bi2LlMhVdNA==}
 
-  '@tanstack/query-db-collection@1.0.27':
-    resolution: {integrity: sha512-A45TZSLJsY9tCPGMiJpLHdx1e4qLAnBvOVrfUXKhbOFtDleLZuU1r+Wg5aMRYKDTIPjOyoPLQYy9TiN92uBU+w==}
+  '@tanstack/query-db-collection@1.0.36':
+    resolution: {integrity: sha512-WOHSZeqFOflWpMxp7ndu8x3M8GyLieWyUsS1fReG8wv6I/1MGOz1j3+XNlGoeoWolYF2hV4l324/dB9BxjAwxw==}
     peerDependencies:
       '@tanstack/query-core': ^5.0.0
       typescript: '>=4.7'
 
-  '@tanstack/query-devtools@5.93.0':
-    resolution: {integrity: sha512-+kpsx1NQnOFTZsw6HAFCW3HkKg0+2cepGtAWXjiiSOJJ1CtQpt72EE2nyZb+AjAbLRPoeRmPJ8MtQd8r8gsPdg==}
+  '@tanstack/query-devtools@5.100.3':
+    resolution: {integrity: sha512-RfLRX0R9yXYNbtt1OIIN4mObzTT8/jteljgioTMwSKRw6C84xrLjnDRIyIzMhUZxbCJHrgkXiD9IA8owiYFA9A==}
 
-  '@tanstack/solid-db@0.2.10':
-    resolution: {integrity: sha512-lW+loH5UzTdgVHOT7nbz0VoKpWahWHbzhww0epd+fYe5tSWBAVWwuBsIMxF4CjTJ5cH0qo5EWp90XYwTJSuMzQ==}
+  '@tanstack/solid-db@0.2.19':
+    resolution: {integrity: sha512-3pbTO3p+yznbJfVcSU+oq4r52Wd3vsDIeeokoi7G8S81FgztRgT+6jkPBUUxZdN/fH6pOIDqCFTB1ahS+ZVKWw==}
     peerDependencies:
       solid-js: '>=1.9.0'
 
-  '@tanstack/solid-devtools@0.8.0':
-    resolution: {integrity: sha512-mJn8j6DYvyayyweeLbdaHwjhKFB1lpCU6cN1+KygluLX6etmrBBC/oDMKQTTbnrQk6EbI9Xa9kmyOREroIaXzA==}
+  '@tanstack/solid-devtools@0.8.2':
+    resolution: {integrity: sha512-tzHF9rNPd9mO5vCArBkVABNe3qs+hvocra4LyRi/aFZC/0leLtD/TpXGnYx4IjDixTqkMCv3PLaG0HTwI5sdnw==}
     engines: {node: '>=18'}
     peerDependencies:
       solid-js: '>=1.9.7'
 
-  '@tanstack/solid-form@1.28.4':
-    resolution: {integrity: sha512-ZhA/oQQJzfY0Un5XFiHbfCwuWyShATHIajdx6xjcm34g0xpwoioGyxAPm7pXLpnUAzln0liCkKX+L77rKj3/6A==}
+  '@tanstack/solid-form@1.29.1':
+    resolution: {integrity: sha512-ZIkqyNSKISpglPNMEwqBa1Mo+SbmbUQgfEyDCBYt5jaLQYoXpsBq6Fsq4+fup5nDyhH3ScB9ZOFpUuZxNHgrjQ==}
     peerDependencies:
       solid-js: '>=1.9.9'
 
-  '@tanstack/solid-hotkeys-devtools@0.4.3':
-    resolution: {integrity: sha512-iP0u4BxkcPQeB2bhWzrO/ZhFrsazB9cAa9xq/6+q4GnC5c/jQQ15yDxp1UEeP4BLVX3kQ4cwpkHG9CVkopYz/A==}
+  '@tanstack/solid-hotkeys-devtools@0.6.6':
+    resolution: {integrity: sha512-/OWLzCT37m97yh/0id06X6B3XzzEBzsKLV2Roer1YcnTvdCJOnEwNUR8D5Z6qudsvJNhaVuF6qd7Hdid9P3dHg==}
     engines: {node: '>=18'}
     peerDependencies:
       solid-js: '>=1.7.0'
 
-  '@tanstack/solid-hotkeys@0.4.2':
-    resolution: {integrity: sha512-HelOz/mnCZ6Q5n4udwVr/U6o7gEWt8mIKdzxxsMKS42nLK64moTZrO5FLFTsiCgUZS9Vm2N14mQ+6a7ha3Y0yQ==}
+  '@tanstack/solid-hotkeys@0.9.1':
+    resolution: {integrity: sha512-h3oRPt5doI8i3zTJ4Fo5O2XuJ8j/6L9QyoFuaQaR9xFRJvCqGolhYLBjMKOfqj8M3CRCcweVTRXjv12xIohDwg==}
     engines: {node: '>=18'}
     peerDependencies:
       solid-js: '>=1.7.0'
 
-  '@tanstack/solid-query-devtools@5.91.3':
-    resolution: {integrity: sha512-xzVwIIxQPbiublZP3RkGp8KVjt8zenv5y1YTSRarP32mLUHJgfdofvjsDvMEhhL/lomz90qa0jCIGsSxoSTyYQ==}
+  '@tanstack/solid-query-devtools@5.100.3':
+    resolution: {integrity: sha512-agZNT89WBQlUDgc7PmfrXyOhGv5yhVZE1d+3+LbZ1qIJBfsdZjbhc/HseSMeDLzoC3Ax+pFWeTfRtPpKS5SKEQ==}
     peerDependencies:
-      '@tanstack/solid-query': ^5.90.23
+      '@tanstack/solid-query': ^5.100.3
       solid-js: ^1.6.0
 
-  '@tanstack/solid-query@5.90.23':
-    resolution: {integrity: sha512-pbZc4+Kgm7ktzIuu01R3KOWfazQKgNp4AZvW0RSvv+sNMpYoileUDAkXEcjDJe6RJmb3fVvTR4LlcSL5pxDElQ==}
+  '@tanstack/solid-query@5.100.3':
+    resolution: {integrity: sha512-vEB4y3xGuN+wy5zeX9HiHO/k9xfHqskHAc73cBasmDqn+7Id78v//rLioOi9lFF1ynFnQKu5N2rptfN8ur0Yjw==}
     peerDependencies:
       solid-js: ^1.6.0
 
-  '@tanstack/solid-store@0.9.2':
-    resolution: {integrity: sha512-W6D6WnIL0Fch2zcLd7qCFf3eLD6AqwZiPoQnoRFKhe8DFXdxM4GRvfLpsAIQQHsun97EcttbwbfVq14SZfT7jg==}
+  '@tanstack/solid-store@0.9.3':
+    resolution: {integrity: sha512-XThXDzwJT8zeatmxFK1UISikfzz1z76mMlpg1IBDPrJp6df6U3cpJInZRbYs3xlVsnhMziuZigaSkzMyZESK9Q==}
     peerDependencies:
       solid-js: ^1.6.0
 
@@ -4308,8 +4525,8 @@ packages:
     peerDependencies:
       solid-js: '>=1.3'
 
-  '@tanstack/store@0.9.2':
-    resolution: {integrity: sha512-K013lUJEFJK2ofFQ/hZKJUmCnpcV00ebLyOyFOWQvyQHUOZp/iYO84BM6aOGiV81JzwbX0APTVmW8YI7yiG5oA==}
+  '@tanstack/store@0.9.3':
+    resolution: {integrity: sha512-8reSzl/qGWGGVKhBoxXPMWzATSbZLZFWhwBAFO9NAyp0TxzfBP0mIrGb8CP8KrQTmvzXlR/vFPPUrHTLBGyFyw==}
 
   '@tanstack/table-core@8.21.3':
     resolution: {integrity: sha512-ldZXEhOBb8Is7xLs01fR3YEc3DERiz5silj8tnGkFZytt1abEvl/GhUmCE0PMLaMPTa3Jk4HbKmRlHmu+gCftg==}
@@ -4445,6 +4662,9 @@ packages:
   '@types/estree@0.0.39':
     resolution: {integrity: sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==}
 
+  '@types/estree@1.0.7':
+    resolution: {integrity: sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==}
+
   '@types/estree@1.0.8':
     resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==}
 
@@ -4607,16 +4827,32 @@ packages:
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
 
+  '@typescript-eslint/project-service@8.59.0':
+    resolution: {integrity: sha512-Lw5ITrR5s5TbC19YSvlr63ZfLaJoU6vtKTHyB0GQOpX0W7d5/Ir6vUahWi/8Sps/nOukZQ0IB3SmlxZnjaKVnw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      typescript: '>=4.8.4 <6.1.0'
+
   '@typescript-eslint/scope-manager@8.52.0':
     resolution: {integrity: sha512-ixxqmmCcc1Nf8S0mS0TkJ/3LKcC8mruYJPOU6Ia2F/zUUR4pApW7LzrpU3JmtePbRUTes9bEqRc1Gg4iyRnDzA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  '@typescript-eslint/scope-manager@8.59.0':
+    resolution: {integrity: sha512-UzR16Ut8IpA3Mc4DbgAShlPPkVm8xXMWafXxB0BocaVRHs8ZGakAxGRskF7FId3sdk9lgGD73GSFaWmWFDE4dg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
   '@typescript-eslint/tsconfig-utils@8.52.0':
     resolution: {integrity: sha512-jl+8fzr/SdzdxWJznq5nvoI7qn2tNYV/ZBAEcaFMVXf+K6jmXvAFrgo/+5rxgnL152f//pDEAYAhhBAZGrVfwg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
 
+  '@typescript-eslint/tsconfig-utils@8.59.0':
+    resolution: {integrity: sha512-91Sbl3s4Kb3SybliIY6muFBmHVv+pYXfybC4Oolp3dvk8BvIE3wOPc+403CWIT7mJNkfQRGtdqghzs2+Z91Tqg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      typescript: '>=4.8.4 <6.1.0'
+
   '@typescript-eslint/types@7.18.0':
     resolution: {integrity: sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==}
     engines: {node: ^18.18.0 || >=20.0.0}
@@ -4625,6 +4861,10 @@ packages:
     resolution: {integrity: sha512-LWQV1V4q9V4cT4H5JCIx3481iIFxH1UkVk+ZkGGAV1ZGcjGI9IoFOfg3O6ywz8QqCDEp7Inlg6kovMofsNRaGg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  '@typescript-eslint/types@8.59.0':
+    resolution: {integrity: sha512-nLzdsT1gdOgFxxxwrlNVUBzSNBEEHJ86bblmk4QAS6stfig7rcJzWKqCyxFy3YRRHXDWEkb2NralA1nOYkkm/A==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
   '@typescript-eslint/typescript-estree@7.18.0':
     resolution: {integrity: sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==}
     engines: {node: ^18.18.0 || >=20.0.0}
@@ -4640,6 +4880,12 @@ packages:
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
 
+  '@typescript-eslint/typescript-estree@8.59.0':
+    resolution: {integrity: sha512-O9Re9P1BmBLFJyikRbQpLku/QA3/AueZNO9WePLBwQrvkixTmDe8u76B6CYUAITRl/rHawggEqUGn5QIkVRLMw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      typescript: '>=4.8.4 <6.1.0'
+
   '@typescript-eslint/utils@8.52.0':
     resolution: {integrity: sha512-wYndVMWkweqHpEpwPhwqE2lnD2DxC6WVLupU/DOt/0/v+/+iQbbzO3jOHjmBMnhu0DgLULvOaU4h4pwHYi2oRQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -4647,6 +4893,13 @@ packages:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <6.0.0'
 
+  '@typescript-eslint/utils@8.59.0':
+    resolution: {integrity: sha512-I1R/K7V07XsMJ12Oaxg/O9GfrysGTmCRhvZJBv0RE0NcULMzjqVpR5kRRQjHsz3J/bElU7HwCO7zkqL+MSUz+g==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.1.0'
+
   '@typescript-eslint/visitor-keys@7.18.0':
     resolution: {integrity: sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==}
     engines: {node: ^18.18.0 || >=20.0.0}
@@ -4655,6 +4908,10 @@ packages:
     resolution: {integrity: sha512-ink3/Zofus34nmBsPjow63FP5M7IGff0RKAgqR6+CFpdk22M7aLwC9gOcLGYqr7MczLPzZVERW9hRog3O4n1sQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  '@typescript-eslint/visitor-keys@8.59.0':
+    resolution: {integrity: sha512-/uejZt4dSere1bx12WLlPfv8GktzcaDtuJ7s42/HEZ5zGj9oxRaD4bj7qwSunXkf+pbAhFt2zjpHYUiT5lHf0Q==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
   '@vitest/browser-playwright@4.0.18':
     resolution: {integrity: sha512-gfajTHVCiwpxRj1qh0Sh/5bbGLG4F/ZH/V9xvFVoFddpITfMta9YGow0W6ZpTTORv2vdJuz9TnrNSmjKvpOf4g==}
     peerDependencies:
@@ -4784,6 +5041,11 @@ packages:
     peerDependencies:
       acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
 
+  acorn@8.14.0:
+    resolution: {integrity: sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+
   acorn@8.15.0:
     resolution: {integrity: sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==}
     engines: {node: '>=0.4.0'}
@@ -4801,6 +5063,10 @@ packages:
     resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
     engines: {node: '>= 6.0.0'}
 
+  agent-base@7.1.1:
+    resolution: {integrity: sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==}
+    engines: {node: '>= 14'}
+
   agent-base@7.1.4:
     resolution: {integrity: sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==}
     engines: {node: '>= 14'}
@@ -4991,6 +5257,9 @@ packages:
   async@2.6.4:
     resolution: {integrity: sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==}
 
+  async@3.2.5:
+    resolution: {integrity: sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==}
+
   async@3.2.6:
     resolution: {integrity: sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==}
 
@@ -5156,6 +5425,10 @@ packages:
   bl@4.1.0:
     resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
 
+  body-parser@1.20.2:
+    resolution: {integrity: sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==}
+    engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
+
   body-parser@1.20.3:
     resolution: {integrity: sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==}
     engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
@@ -5177,14 +5450,26 @@ packages:
   brace-expansion@2.0.2:
     resolution: {integrity: sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==}
 
+  brace-expansion@2.1.0:
+    resolution: {integrity: sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==}
+
   brace-expansion@5.0.4:
     resolution: {integrity: sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==}
     engines: {node: 18 || 20 || >=22}
 
+  brace-expansion@5.0.5:
+    resolution: {integrity: sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==}
+    engines: {node: 18 || 20 || >=22}
+
   braces@3.0.3:
     resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
     engines: {node: '>=8'}
 
+  browserslist@4.28.0:
+    resolution: {integrity: sha512-tbydkR/CxfMwelN0vwdP/pLkDwyAASZ+VfWm4EOwlB6SWhx1sYnWLqo8N5j0rAzPfzfRaxt0mM/4wPU/Su84RQ==}
+    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
+    hasBin: true
+
   browserslist@4.28.1:
     resolution: {integrity: sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==}
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
@@ -5255,6 +5540,10 @@ packages:
     resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==}
     engines: {node: '>= 0.4'}
 
+  call-bind@1.0.7:
+    resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==}
+    engines: {node: '>= 0.4'}
+
   call-bind@1.0.9:
     resolution: {integrity: sha512-a/hy+pNsFUTR+Iz8TCJvXudKVLAnz/DyeSUo10I5yvFDQJBFU2s9uqQpoSrJlroHUKoKqzg+epxyP9lqFdzfBQ==}
     engines: {node: '>= 0.4'}
@@ -5283,6 +5572,9 @@ packages:
   camelize@1.0.1:
     resolution: {integrity: sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==}
 
+  caniuse-lite@1.0.30001762:
+    resolution: {integrity: sha512-PxZwGNvH7Ak8WX5iXzoK1KPZttBXNPuaOvI2ZYU7NrlM+d9Ov+TUvlLOBNGzVXAntMSMMlJPd+jY6ovrVjSmUw==}
+
   caniuse-lite@1.0.30001778:
     resolution: {integrity: sha512-PN7uxFL+ExFJO61aVmP1aIEG4i9whQd4eoSCebav62UwDyp5OHh06zN4jqKSMePVgxHifCw1QJxdRkA1Pisekg==}
 
@@ -5330,8 +5622,8 @@ packages:
     peerDependencies:
       chart.js: '>=3.7.0'
 
-  chartjs-plugin-trendline@3.2.0:
-    resolution: {integrity: sha512-UQ309v67EPc6KQsEIfn8YEBOclsZGvfddjbK8ZIN9QhEHQKzUrtJPpMc1F8o5G7ErgIFvmtFnt5YP9vkTPswSg==}
+  chartjs-plugin-trendline@3.2.4:
+    resolution: {integrity: sha512-gGujVUWTigENcNUnXexObqxhcsedX9rS/iBemM5A1eJlE6GAno8rlNTUzZXV5fu8EpzsE7OQQvbkfaauUA5Y7g==}
 
   check-error@2.1.3:
     resolution: {integrity: sha512-PAJdDJusoxnwm1VwW07VWwUN1sl7smmC3OKggvndJFadxxDRyFJBX/ggnu/KE4kQAB7a3Dp8f/YXC1FlUprWmA==}
@@ -5748,6 +6040,10 @@ packages:
     resolution: {integrity: sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==}
     engines: {node: '>=4.8'}
 
+  cross-spawn@7.0.3:
+    resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
+    engines: {node: '>= 8'}
+
   cross-spawn@7.0.6:
     resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
     engines: {node: '>= 8'}
@@ -5858,6 +6154,24 @@ packages:
       supports-color:
         optional: true
 
+  debug@4.3.6:
+    resolution: {integrity: sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  debug@4.4.1:
+    resolution: {integrity: sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
   debug@4.4.3:
     resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==}
     engines: {node: '>=6.0'}
@@ -6120,8 +6434,8 @@ packages:
     engines: {node: '>=0.10.0'}
     hasBin: true
 
-  electron-to-chromium@1.5.302:
-    resolution: {integrity: sha512-sM6HAN2LyK82IyPBpznDRqlTQAtuSaO+ShzFiWTvoMJLHyZ+Y39r8VMfHzwbU8MVBzQ4Wdn85+wlZl2TLGIlwg==}
+  electron-to-chromium@1.5.267:
+    resolution: {integrity: sha512-0Drusm6MVRXSOJpGbaSVgcQsuB4hEkMpHXaVstcPmhu5LIedxs1xNK/nIxmQIU/RPC0+1/o0AVZfBTkTNJOdUw==}
 
   emoji-regex@8.0.0:
     resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
@@ -6149,6 +6463,10 @@ packages:
   end-of-stream@1.4.4:
     resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==}
 
+  enhanced-resolve@5.17.1:
+    resolution: {integrity: sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==}
+    engines: {node: '>=10.13.0'}
+
   enhanced-resolve@5.20.0:
     resolution: {integrity: sha512-/ce7+jQ1PQ6rVXwe+jKEg5hW5ciicHwIQUagZkp6IufBoY3YDgdTTY1azVs0qoRgVmvsNB+rbjLJxDAeHHtwsQ==}
     engines: {node: '>=10.13.0'}
@@ -6219,6 +6537,11 @@ packages:
   es6-promise@3.3.1:
     resolution: {integrity: sha512-SOp9Phqvqn7jtEUxPWdWfWoLmyt2VaJ6MpvP9Comy1MceMXqE6bxvaTu4iaxpYYPzhny28Lc+M87/c2cPK6lDg==}
 
+  esbuild@0.25.0:
+    resolution: {integrity: sha512-BXq5mqc8ltbaN34cDqWuYKyNhX8D/Z0J1xdtdQ8UcIIIyJyz+ZMKUt58tF3SrZ85jcfN/PZYhjR5uDQAYNVbuw==}
+    engines: {node: '>=18'}
+    hasBin: true
+
   esbuild@0.25.11:
     resolution: {integrity: sha512-KohQwyzrKTQmhXDW1PjCv3Tyspn9n5GcY2RTDqeORIdIJY8yKIF7sTSopFmn/wpMPW4rdPXI0UE5LJLuq3bx0Q==}
     engines: {node: '>=18'}
@@ -6287,6 +6610,10 @@ packages:
     resolution: {integrity: sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  eslint-visitor-keys@5.0.1:
+    resolution: {integrity: sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
+
   eslint@9.39.1:
     resolution: {integrity: sha512-BhHmn2yNOFA9H9JmmIVKJmd288g9hrVRDkdoIgRCRuSySRUHH7r/DI6aAXW9T1WwUuY3DFgrcaqB+deURBLR5g==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -6434,6 +6761,10 @@ packages:
   fast-xml-builder@1.1.4:
     resolution: {integrity: sha512-f2jhpN4Eccy0/Uz9csxh3Nu6q4ErKxf0XIsasomfOihuSUa3/xw6w8dnOtCDgEItQFJG8KyXPzQXzcODDrrbOg==}
 
+  fast-xml-parser@4.4.1:
+    resolution: {integrity: sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw==}
+    hasBin: true
+
   fast-xml-parser@4.5.3:
     resolution: {integrity: sha512-RKihhV+SHsIUGXObeVy9AXiBbFwkVk7Syp8XgwN5U3JV416+Gwp/GO9i0JYKmikykgz/UHRrrV4ROuZEo/T0ig==}
     hasBin: true
@@ -6456,6 +6787,14 @@ packages:
     resolution: {integrity: sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==}
     engines: {node: '>=0.8.0'}
 
+  fdir@6.4.4:
+    resolution: {integrity: sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==}
+    peerDependencies:
+      picomatch: ^3 || ^4
+    peerDependenciesMeta:
+      picomatch:
+        optional: true
+
   fdir@6.5.0:
     resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==}
     engines: {node: '>=12.0.0'}
@@ -6596,6 +6935,10 @@ packages:
     resolution: {integrity: sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==}
     engines: {node: '>= 0.12'}
 
+  form-data@4.0.0:
+    resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
+    engines: {node: '>= 6'}
+
   form-data@4.0.4:
     resolution: {integrity: sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==}
     engines: {node: '>= 6'}
@@ -6750,7 +7093,6 @@ packages:
   git-raw-commits@5.0.0:
     resolution: {integrity: sha512-I2ZXrXeOc0KrCvC7swqtIFXFN+rbjnC7b2T943tvemIOVNl+XP8YnA9UVwqFhzzLClnSA60KR/qEjLpXzs73Qg==}
     engines: {node: '>=18'}
-    deprecated: This package is no longer maintained. For the JavaScript API, please use @conventional-changelog/git-client instead.
     hasBin: true
 
   git-raw-commits@5.0.1:
@@ -6761,7 +7103,6 @@ packages:
   git-semver-tags@8.0.0:
     resolution: {integrity: sha512-N7YRIklvPH3wYWAR2vysaqGLPRcpwQ0GKdlqTiVN5w1UmCdaeY3K8s6DMKRCh54DDdzyt/OAB6C8jgVtb7Y2Fg==}
     engines: {node: '>=18'}
-    deprecated: This package is no longer maintained. For the JavaScript API, please use @conventional-changelog/git-client instead.
     hasBin: true
 
   glob-parent@5.1.2:
@@ -6780,7 +7121,6 @@ packages:
 
   glob@10.4.5:
     resolution: {integrity: sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==}
-    deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
     hasBin: true
 
   glob@13.0.6:
@@ -6789,12 +7129,12 @@ packages:
 
   glob@7.2.3:
     resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
-    deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
+    deprecated: Glob versions prior to v9 are no longer supported
 
   glob@8.1.0:
     resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==}
     engines: {node: '>=12'}
-    deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
+    deprecated: Glob versions prior to v9 are no longer supported
 
   global-directory@5.0.0:
     resolution: {integrity: sha512-1pgFdhK3J2LeM+dVf2Pd424yHx2ou338lC0ErNP2hPx4j8eW1Sp0XqSjNxtk6Tc4Kr5wlWtSvz8cn2yb7/SG/w==}
@@ -7036,6 +7376,10 @@ packages:
     resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
     engines: {node: '>= 6'}
 
+  https-proxy-agent@7.0.5:
+    resolution: {integrity: sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==}
+    engines: {node: '>= 14'}
+
   https-proxy-agent@7.0.6:
     resolution: {integrity: sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==}
     engines: {node: '>= 14'}
@@ -7511,6 +7855,10 @@ packages:
   js-tokens@4.0.0:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
 
+  js-yaml@4.1.0:
+    resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
+    hasBin: true
+
   js-yaml@4.1.1:
     resolution: {integrity: sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==}
     hasBin: true
@@ -7553,7 +7901,6 @@ packages:
 
   json-ptr@3.1.1:
     resolution: {integrity: sha512-SiSJQ805W1sDUCD1+/t1/1BIrveq2Fe9HJqENxZmMCILmrPI7WhS/pePpIOx85v6/H2z1Vy7AI08GV2TzfXocg==}
-    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
 
   json-schema-to-ts@2.7.2:
     resolution: {integrity: sha512-R1JfqKqbBR4qE8UyBR56Ms30LL62/nlhoz+1UkfI/VE7p54Awu919FZ6ZUPG8zIa3XB65usPJgr1ONVncUGSaQ==}
@@ -7576,6 +7923,9 @@ packages:
     engines: {node: '>=6'}
     hasBin: true
 
+  jsonfile@6.1.0:
+    resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
+
   jsonfile@6.2.0:
     resolution: {integrity: sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==}
 
@@ -7621,6 +7971,7 @@ packages:
   keygrip@1.1.0:
     resolution: {integrity: sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==}
     engines: {node: '>= 0.6'}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
 
   keyv@4.5.4:
     resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
@@ -8054,6 +8405,9 @@ packages:
     engines: {node: '>= 12'}
     hasBin: true
 
+  match-sorter@8.3.0:
+    resolution: {integrity: sha512-8Py1GbZi5zsclYSFcPAH4H5xfTbeD0bOREA7qP/t8bW4MbOSlPl8sbqHOedEV7O+Bxyvxm6xs/v6BXJGe+JDNA==}
+
   math-intrinsics@1.1.0:
     resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
     engines: {node: '>= 0.4'}
@@ -8162,12 +8516,20 @@ packages:
     resolution: {integrity: sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==}
     engines: {node: 18 || 20 || >=22}
 
+  minimatch@10.2.5:
+    resolution: {integrity: sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==}
+    engines: {node: 18 || 20 || >=22}
+
   minimatch@3.1.2:
     resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
 
   minimatch@3.1.5:
     resolution: {integrity: sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==}
 
+  minimatch@5.1.6:
+    resolution: {integrity: sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==}
+    engines: {node: '>=10'}
+
   minimatch@5.1.9:
     resolution: {integrity: sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==}
     engines: {node: '>=10'}
@@ -8215,6 +8577,10 @@ packages:
     resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==}
     engines: {node: '>=8'}
 
+  minipass@7.1.2:
+    resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==}
+    engines: {node: '>=16 || 14 >=14.17'}
+
   minipass@7.1.3:
     resolution: {integrity: sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==}
     engines: {node: '>=16 || 14 >=14.17'}
@@ -8508,6 +8874,15 @@ packages:
     resolution: {integrity: sha512-ofRW94Ab0T4AOh5Fk8t0h8OBWrmjb0SSB20xh1H8YnPV9EJ+f5AMoYSUQ2zgJ4Iq2HAK0I2l5/Nequ8YzFS3Hg==}
     engines: {node: 4.x || >=6.0.0}
 
+  node-fetch@2.6.7:
+    resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==}
+    engines: {node: 4.x || >=6.0.0}
+    peerDependencies:
+      encoding: ^0.1.0
+    peerDependenciesMeta:
+      encoding:
+        optional: true
+
   node-fetch@2.7.0:
     resolution: {integrity: sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==}
     engines: {node: 4.x || >=6.0.0}
@@ -9173,6 +9548,14 @@ packages:
     resolution: {integrity: sha512-n7mar4T0xQ+39dE2vGTAlbxUEpndwPANH0kDef1/MYsB8Bba9wshkybIRx74qgcvKQPEWErf9AqAdYjhzY2Ilg==}
     engines: {node: '>=20'}
 
+  qs@6.11.0:
+    resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==}
+    engines: {node: '>=0.6'}
+
+  qs@6.12.3:
+    resolution: {integrity: sha512-AWJm14H1vVaO/iNZ4/hO+HyaTehuy9nRqVdkTqlJt0HWvBiBIEXFmb4C0DGeYo3Xes9rrEW+TxHsaigCbN5ICQ==}
+    engines: {node: '>=0.6'}
+
   qs@6.13.0:
     resolution: {integrity: sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==}
     engines: {node: '>=0.6'}
@@ -9328,6 +9711,9 @@ packages:
   regenerate@1.4.2:
     resolution: {integrity: sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==}
 
+  regenerator-runtime@0.14.1:
+    resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==}
+
   regexp.prototype.flags@1.5.4:
     resolution: {integrity: sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==}
     engines: {node: '>= 0.4'}
@@ -9355,6 +9741,9 @@ packages:
     resolution: {integrity: sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==}
     engines: {node: '>= 0.10'}
 
+  remove-accents@0.5.0:
+    resolution: {integrity: sha512-8g3/Otx1eJaVD12e31UbJj1YzdtVvzH85HV7t+9MJYk/u3XmkOUJ5Ys9wQrf9PCPK8+xn4ymzqYCiZl6QWKn+A==}
+
   require-directory@2.1.1:
     resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
     engines: {node: '>=0.10.0'}
@@ -9387,8 +9776,8 @@ packages:
   resolve-pkg-maps@1.0.0:
     resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==}
 
-  resolve@1.22.11:
-    resolution: {integrity: sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==}
+  resolve@1.22.10:
+    resolution: {integrity: sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==}
     engines: {node: '>= 0.4'}
     hasBin: true
 
@@ -9464,8 +9853,8 @@ packages:
     engines: {node: '>=10.0.0'}
     hasBin: true
 
-  rollup@4.52.5:
-    resolution: {integrity: sha512-3GuObel8h7Kqdjt0gxkEzaifHTqLVW56Y/bjN7PSQtkKr0w3V/QYSdt6QWYtd7A1xUtYQigtdUfgj1RvWVtorw==}
+  rollup@4.40.0:
+    resolution: {integrity: sha512-Noe455xmA96nnqH5piFtLobsGbCij7Tu+tb3c1vYjNbTkfzGqXqQXG3wJaYXkRZuQ0vEYN4bhwg7QnIrqB5B+w==}
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
 
@@ -9564,6 +9953,11 @@ packages:
     resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}
     hasBin: true
 
+  semver@7.6.3:
+    resolution: {integrity: sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==}
+    engines: {node: '>=10'}
+    hasBin: true
+
   semver@7.7.3:
     resolution: {integrity: sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==}
     engines: {node: '>=10'}
@@ -9601,14 +9995,24 @@ packages:
     peerDependencies:
       seroval: ^1.0
 
-  seroval@1.3.2:
-    resolution: {integrity: sha512-RbcPH1n5cfwKrru7v7+zrZvjLurgHhGyso3HTyGtRivGWgYjbOmGuivCQaORNELjNONoK35nj28EoWul9sb1zQ==}
+  seroval-plugins@1.5.2:
+    resolution: {integrity: sha512-qpY0Cl+fKYFn4GOf3cMiq6l72CpuVaawb6ILjubOQ+diJ54LfOWaSSPsaswN8DRPIPW4Yq+tE1k5aKd7ILyaFg==}
     engines: {node: '>=10'}
-
+    peerDependencies:
+      seroval: ^1.0
+
+  seroval@1.3.2:
+    resolution: {integrity: sha512-RbcPH1n5cfwKrru7v7+zrZvjLurgHhGyso3HTyGtRivGWgYjbOmGuivCQaORNELjNONoK35nj28EoWul9sb1zQ==}
+    engines: {node: '>=10'}
+
   seroval@1.5.0:
     resolution: {integrity: sha512-OE4cvmJ1uSPrKorFIH9/w/Qwuvi/IMcGbv5RKgcJ/zjA/IohDLU6SVaxFN9FwajbP7nsX0dQqMDes1whk3y+yw==}
     engines: {node: '>=10'}
 
+  seroval@1.5.2:
+    resolution: {integrity: sha512-xcRN39BdsnO9Tf+VzsE7b3JyTJASItIV1FVFewJKCFcW4s4haIKS3e6vj8PGB9qBwC7tnuOywQMdv5N4qkzi7Q==}
+    engines: {node: '>=10'}
+
   serve-static@1.16.2:
     resolution: {integrity: sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==}
     engines: {node: '>= 0.8.0'}
@@ -9693,6 +10097,10 @@ packages:
     resolution: {integrity: sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==}
     engines: {node: '>= 0.4'}
 
+  side-channel@1.0.6:
+    resolution: {integrity: sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==}
+    engines: {node: '>= 0.4'}
+
   side-channel@1.1.0:
     resolution: {integrity: sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==}
     engines: {node: '>= 0.4'}
@@ -9793,6 +10201,9 @@ packages:
   solid-js@1.9.11:
     resolution: {integrity: sha512-WEJtcc5mkh/BnHA6Yrg4whlF8g6QwpmXXRg4P2ztPmcKeHHlH4+djYecBLhSpecZY2RRECXYUwIc/C2r3yzQ4Q==}
 
+  solid-js@1.9.12:
+    resolution: {integrity: sha512-QzKaSJq2/iDrWR1As6MHZQ8fQkdOBf8GReYb7L5iKwMGceg7HxDcaOHk0at66tNgn9U2U7dXo8ZZpLIAmGMzgw==}
+
   solid-refresh@0.6.3:
     resolution: {integrity: sha512-F3aPsX6hVw9ttm5LYlth8Q15x6MlI/J3Dn+o3EQyRTtTxidepSTwAYdozt01/YA+7ObcciagGEyXIopGZzQtbA==}
     peerDependencies:
@@ -10003,6 +10414,10 @@ packages:
     resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
     engines: {node: '>=8'}
 
+  strip-ansi@7.1.0:
+    resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==}
+    engines: {node: '>=12'}
+
   strip-ansi@7.1.2:
     resolution: {integrity: sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==}
     engines: {node: '>=12'}
@@ -10035,6 +10450,9 @@ packages:
     resolution: {integrity: sha512-1tB5mhVo7U+ETBKNf92xT4hrQa3pm0MZ0PQvuDnWgAAGHDsfp4lPSpiS6psrSiet87wyGPh9ft6wmhOMQ0hDiw==}
     engines: {node: '>=14.16'}
 
+  strnum@1.0.5:
+    resolution: {integrity: sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==}
+
   strnum@1.1.2:
     resolution: {integrity: sha512-vrN+B7DBIoTTZjnPNewwhx6cBA/H+IS7rfW68n7XxC1y7uoiGQBxaKzqucGUgavX15dJgiGztLJ8vxuEzwqBdA==}
 
@@ -10188,6 +10606,10 @@ packages:
   tailwindcss@4.2.1:
     resolution: {integrity: sha512-/tBrSQ36vCleJkAOsy9kbNTgaxvGbyOamC30PRePTQe/o1MFwEKHQk4Cn7BNGaPtjp+PuUrByJehM1hgxfq4sw==}
 
+  tapable@2.2.1:
+    resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==}
+    engines: {node: '>=6'}
+
   tapable@2.3.0:
     resolution: {integrity: sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==}
     engines: {node: '>=6'}
@@ -10208,7 +10630,6 @@ packages:
   tar@6.2.1:
     resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==}
     engines: {node: '>=10'}
-    deprecated: Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
 
   tcp-port-used@1.0.2:
     resolution: {integrity: sha512-l7ar8lLUD3XS1V2lfoJlCBaeoaWo/2xfYt81hM7VlvR4RrMVFqfmzfhLVk40hAb368uitje5gPtBRL1m/DGvLA==}
@@ -10228,8 +10649,8 @@ packages:
     resolution: {integrity: sha512-G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw==}
     engines: {node: '>=10'}
 
-  terser@5.46.0:
-    resolution: {integrity: sha512-jTwoImyr/QbOWFFso3YoU3ik0jBBDJ6JTOQiy/J2YxVJdZCc+5u7skhNwiOR3FQIygFqVUPHl7qbbxtjW2K3Qg==}
+  terser@5.31.3:
+    resolution: {integrity: sha512-pAfYn3NIZLyZpa83ZKigvj6Rn9c/vd5KfYGX7cN1mnzqgDcxWvrU5ZtAfIKhEXz9nRecw4z3LXkjaq96/qZqAA==}
     engines: {node: '>=10'}
     hasBin: true
 
@@ -10285,10 +10706,18 @@ packages:
     resolution: {integrity: sha512-dAqSqE/RabpBKI8+h26GfLq6Vb3JVXs30XYQjdMjaj/c2tS8IYYMbIzP599KtRj7c57/wYApb3QjgRgXmrCukA==}
     engines: {node: '>=18'}
 
+  tinyglobby@0.2.13:
+    resolution: {integrity: sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==}
+    engines: {node: '>=12.0.0'}
+
   tinyglobby@0.2.15:
     resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==}
     engines: {node: '>=12.0.0'}
 
+  tinyglobby@0.2.16:
+    resolution: {integrity: sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==}
+    engines: {node: '>=12.0.0'}
+
   tinypool@2.1.0:
     resolution: {integrity: sha512-Pugqs6M0m7Lv1I7FtxN4aoyToKg1C4tu+/381vH35y8oENM/Ai7f7C4StcoK4/+BSw9ebcS8jRiVrORFKCALLw==}
     engines: {node: ^20.0.0 || >=22.0.0}
@@ -10320,6 +10749,10 @@ packages:
     resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==}
     engines: {node: '>=0.6.0'}
 
+  tmp@0.2.3:
+    resolution: {integrity: sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==}
+    engines: {node: '>=14.14'}
+
   tmp@0.2.5:
     resolution: {integrity: sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==}
     engines: {node: '>=14.14'}
@@ -10393,6 +10826,12 @@ packages:
     peerDependencies:
       typescript: '>=4.8.4'
 
+  ts-api-utils@2.5.0:
+    resolution: {integrity: sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA==}
+    engines: {node: '>=18.12'}
+    peerDependencies:
+      typescript: '>=4.8.4'
+
   ts-dedent@2.2.0:
     resolution: {integrity: sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==}
     engines: {node: '>=6.10'}
@@ -10412,6 +10851,9 @@ packages:
     resolution: {integrity: sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==}
     engines: {node: '>=6'}
 
+  tslib@2.6.3:
+    resolution: {integrity: sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==}
+
   tslib@2.8.1:
     resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
 
@@ -11149,6 +11591,18 @@ packages:
       utf-8-validate:
         optional: true
 
+  ws@8.20.0:
+    resolution: {integrity: sha512-sAt8BhgNbzCtgGbt2OxmpuryO63ZoDk/sqaB/znQm94T4fCEsy/yV+7CdC1kJhOU9lboAEU7R3kquuycDoibVA==}
+    engines: {node: '>=10.0.0'}
+    peerDependencies:
+      bufferutil: ^4.0.1
+      utf-8-validate: '>=5.0.2'
+    peerDependenciesMeta:
+      bufferutil:
+        optional: true
+      utf-8-validate:
+        optional: true
+
   wsl-utils@0.1.0:
     resolution: {integrity: sha512-h3Fbisa2nKGPxCpm89Hk33lBLsnaGBvctQopaBSOW/uIs6FTe1ATyAnKFJrzVs9vpGdsTe73WF3V4lIsk4Gacw==}
     engines: {node: '>=18'}
@@ -11237,6 +11691,9 @@ packages:
   zod@3.23.8:
     resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==}
 
+  zod@3.25.76:
+    resolution: {integrity: sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==}
+
 snapshots:
 
   '@acemir/cssom@0.9.30': {}
@@ -11260,7 +11717,7 @@ snapshots:
       '@jsdevtools/ono': 7.1.3
       '@types/json-schema': 7.0.15
       call-me-maybe: 1.0.2
-      js-yaml: 4.1.1
+      js-yaml: 4.1.0
 
   '@asamuzakjp/css-color@4.1.1':
     dependencies:
@@ -11280,6 +11737,12 @@ snapshots:
 
   '@asamuzakjp/nwsapi@2.3.9': {}
 
+  '@babel/code-frame@7.27.1':
+    dependencies:
+      '@babel/helper-validator-identifier': 7.28.5
+      js-tokens: 4.0.0
+      picocolors: 1.1.1
+
   '@babel/code-frame@7.28.6':
     dependencies:
       '@babel/helper-validator-identifier': 7.28.5
@@ -11292,10 +11755,32 @@ snapshots:
       js-tokens: 4.0.0
       picocolors: 1.1.1
 
+  '@babel/compat-data@7.28.5': {}
+
   '@babel/compat-data@7.28.6': {}
 
   '@babel/compat-data@7.29.0': {}
 
+  '@babel/core@7.28.5':
+    dependencies:
+      '@babel/code-frame': 7.27.1
+      '@babel/generator': 7.28.5
+      '@babel/helper-compilation-targets': 7.27.2
+      '@babel/helper-module-transforms': 7.28.3(@babel/core@7.28.5)
+      '@babel/helpers': 7.28.4
+      '@babel/parser': 7.28.5
+      '@babel/template': 7.27.2
+      '@babel/traverse': 7.28.5
+      '@babel/types': 7.28.5
+      '@jridgewell/remapping': 2.3.5
+      convert-source-map: 2.0.0
+      debug: 4.4.3
+      gensync: 1.0.0-beta.2
+      json5: 2.2.3
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
+
   '@babel/core@7.28.6':
     dependencies:
       '@babel/code-frame': 7.28.6
@@ -11309,7 +11794,7 @@ snapshots:
       '@babel/types': 7.28.6
       '@jridgewell/remapping': 2.3.5
       convert-source-map: 2.0.0
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
@@ -11329,13 +11814,21 @@ snapshots:
       '@babel/types': 7.29.0
       '@jridgewell/remapping': 2.3.5
       convert-source-map: 2.0.0
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
 
+  '@babel/generator@7.28.5':
+    dependencies:
+      '@babel/parser': 7.28.5
+      '@babel/types': 7.28.5
+      '@jridgewell/gen-mapping': 0.3.13
+      '@jridgewell/trace-mapping': 0.3.31
+      jsesc: 3.1.0
+
   '@babel/generator@7.28.6':
     dependencies:
       '@babel/parser': 7.29.2
@@ -11356,11 +11849,19 @@ snapshots:
     dependencies:
       '@babel/types': 7.29.0
 
+  '@babel/helper-compilation-targets@7.27.2':
+    dependencies:
+      '@babel/compat-data': 7.28.5
+      '@babel/helper-validator-option': 7.27.1
+      browserslist: 4.28.0
+      lru-cache: 5.1.1
+      semver: 6.3.1
+
   '@babel/helper-compilation-targets@7.28.6':
     dependencies:
       '@babel/compat-data': 7.28.6
       '@babel/helper-validator-option': 7.27.1
-      browserslist: 4.28.1
+      browserslist: 4.28.0
       lru-cache: 5.1.1
       semver: 6.3.1
 
@@ -11389,7 +11890,7 @@ snapshots:
       '@babel/core': 7.29.0
       '@babel/helper-compilation-targets': 7.28.6
       '@babel/helper-plugin-utils': 7.28.6
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
       lodash.debounce: 4.0.8
       resolve: 1.22.12
     transitivePeerDependencies:
@@ -11408,6 +11909,13 @@ snapshots:
     dependencies:
       '@babel/types': 7.29.0
 
+  '@babel/helper-module-imports@7.27.1':
+    dependencies:
+      '@babel/traverse': 7.28.5
+      '@babel/types': 7.28.5
+    transitivePeerDependencies:
+      - supports-color
+
   '@babel/helper-module-imports@7.28.6':
     dependencies:
       '@babel/traverse': 7.28.6
@@ -11415,6 +11923,15 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@babel/helper-module-transforms@7.28.3(@babel/core@7.28.5)':
+    dependencies:
+      '@babel/core': 7.28.5
+      '@babel/helper-module-imports': 7.27.1
+      '@babel/helper-validator-identifier': 7.28.5
+      '@babel/traverse': 7.28.5
+    transitivePeerDependencies:
+      - supports-color
+
   '@babel/helper-module-transforms@7.28.6(@babel/core@7.28.6)':
     dependencies:
       '@babel/core': 7.28.6
@@ -11478,6 +11995,11 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@babel/helpers@7.28.4':
+    dependencies:
+      '@babel/template': 7.27.2
+      '@babel/types': 7.28.5
+
   '@babel/helpers@7.28.6':
     dependencies:
       '@babel/template': 7.28.6
@@ -11488,6 +12010,10 @@ snapshots:
       '@babel/template': 7.28.6
       '@babel/types': 7.29.0
 
+  '@babel/parser@7.28.5':
+    dependencies:
+      '@babel/types': 7.28.5
+
   '@babel/parser@7.28.6':
     dependencies:
       '@babel/types': 7.29.0
@@ -11545,6 +12071,11 @@ snapshots:
       '@babel/core': 7.29.0
       '@babel/helper-plugin-utils': 7.28.6
 
+  '@babel/plugin-syntax-jsx@7.27.1(@babel/core@7.28.5)':
+    dependencies:
+      '@babel/core': 7.28.5
+      '@babel/helper-plugin-utils': 7.28.6
+
   '@babel/plugin-syntax-jsx@7.27.1(@babel/core@7.28.6)':
     dependencies:
       '@babel/core': 7.28.6
@@ -11977,16 +12508,40 @@ snapshots:
       '@babel/types': 7.29.0
       esutils: 2.0.3
 
+  '@babel/runtime@7.25.0':
+    dependencies:
+      regenerator-runtime: 0.14.1
+
+  '@babel/runtime@7.28.4': {}
+
   '@babel/runtime@7.28.6': {}
 
   '@babel/runtime@7.29.2': {}
 
+  '@babel/template@7.27.2':
+    dependencies:
+      '@babel/code-frame': 7.27.1
+      '@babel/parser': 7.28.5
+      '@babel/types': 7.28.5
+
   '@babel/template@7.28.6':
     dependencies:
       '@babel/code-frame': 7.28.6
       '@babel/parser': 7.29.2
       '@babel/types': 7.29.0
 
+  '@babel/traverse@7.28.5':
+    dependencies:
+      '@babel/code-frame': 7.27.1
+      '@babel/generator': 7.28.5
+      '@babel/helper-globals': 7.28.0
+      '@babel/parser': 7.28.5
+      '@babel/template': 7.27.2
+      '@babel/types': 7.28.5
+      debug: 4.4.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@babel/traverse@7.28.6':
     dependencies:
       '@babel/code-frame': 7.28.6
@@ -11995,7 +12550,7 @@ snapshots:
       '@babel/parser': 7.29.2
       '@babel/template': 7.28.6
       '@babel/types': 7.29.0
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
     transitivePeerDependencies:
       - supports-color
 
@@ -12007,10 +12562,15 @@ snapshots:
       '@babel/parser': 7.29.2
       '@babel/template': 7.28.6
       '@babel/types': 7.29.0
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
     transitivePeerDependencies:
       - supports-color
 
+  '@babel/types@7.28.5':
+    dependencies:
+      '@babel/helper-string-parser': 7.27.1
+      '@babel/helper-validator-identifier': 7.28.5
+
   '@babel/types@7.28.6':
     dependencies:
       '@babel/helper-string-parser': 7.27.1
@@ -12297,6 +12857,9 @@ snapshots:
       to-pascal-case: 1.0.0
       unescape-js: 1.1.4
 
+  '@esbuild/aix-ppc64@0.25.0':
+    optional: true
+
   '@esbuild/aix-ppc64@0.25.11':
     optional: true
 
@@ -12306,6 +12869,9 @@ snapshots:
   '@esbuild/aix-ppc64@0.27.7':
     optional: true
 
+  '@esbuild/android-arm64@0.25.0':
+    optional: true
+
   '@esbuild/android-arm64@0.25.11':
     optional: true
 
@@ -12315,6 +12881,9 @@ snapshots:
   '@esbuild/android-arm64@0.27.7':
     optional: true
 
+  '@esbuild/android-arm@0.25.0':
+    optional: true
+
   '@esbuild/android-arm@0.25.11':
     optional: true
 
@@ -12324,6 +12893,9 @@ snapshots:
   '@esbuild/android-arm@0.27.7':
     optional: true
 
+  '@esbuild/android-x64@0.25.0':
+    optional: true
+
   '@esbuild/android-x64@0.25.11':
     optional: true
 
@@ -12333,6 +12905,9 @@ snapshots:
   '@esbuild/android-x64@0.27.7':
     optional: true
 
+  '@esbuild/darwin-arm64@0.25.0':
+    optional: true
+
   '@esbuild/darwin-arm64@0.25.11':
     optional: true
 
@@ -12342,6 +12917,9 @@ snapshots:
   '@esbuild/darwin-arm64@0.27.7':
     optional: true
 
+  '@esbuild/darwin-x64@0.25.0':
+    optional: true
+
   '@esbuild/darwin-x64@0.25.11':
     optional: true
 
@@ -12351,6 +12929,9 @@ snapshots:
   '@esbuild/darwin-x64@0.27.7':
     optional: true
 
+  '@esbuild/freebsd-arm64@0.25.0':
+    optional: true
+
   '@esbuild/freebsd-arm64@0.25.11':
     optional: true
 
@@ -12360,6 +12941,9 @@ snapshots:
   '@esbuild/freebsd-arm64@0.27.7':
     optional: true
 
+  '@esbuild/freebsd-x64@0.25.0':
+    optional: true
+
   '@esbuild/freebsd-x64@0.25.11':
     optional: true
 
@@ -12369,6 +12953,9 @@ snapshots:
   '@esbuild/freebsd-x64@0.27.7':
     optional: true
 
+  '@esbuild/linux-arm64@0.25.0':
+    optional: true
+
   '@esbuild/linux-arm64@0.25.11':
     optional: true
 
@@ -12378,6 +12965,9 @@ snapshots:
   '@esbuild/linux-arm64@0.27.7':
     optional: true
 
+  '@esbuild/linux-arm@0.25.0':
+    optional: true
+
   '@esbuild/linux-arm@0.25.11':
     optional: true
 
@@ -12387,6 +12977,9 @@ snapshots:
   '@esbuild/linux-arm@0.27.7':
     optional: true
 
+  '@esbuild/linux-ia32@0.25.0':
+    optional: true
+
   '@esbuild/linux-ia32@0.25.11':
     optional: true
 
@@ -12396,6 +12989,9 @@ snapshots:
   '@esbuild/linux-ia32@0.27.7':
     optional: true
 
+  '@esbuild/linux-loong64@0.25.0':
+    optional: true
+
   '@esbuild/linux-loong64@0.25.11':
     optional: true
 
@@ -12405,6 +13001,9 @@ snapshots:
   '@esbuild/linux-loong64@0.27.7':
     optional: true
 
+  '@esbuild/linux-mips64el@0.25.0':
+    optional: true
+
   '@esbuild/linux-mips64el@0.25.11':
     optional: true
 
@@ -12414,6 +13013,9 @@ snapshots:
   '@esbuild/linux-mips64el@0.27.7':
     optional: true
 
+  '@esbuild/linux-ppc64@0.25.0':
+    optional: true
+
   '@esbuild/linux-ppc64@0.25.11':
     optional: true
 
@@ -12423,6 +13025,9 @@ snapshots:
   '@esbuild/linux-ppc64@0.27.7':
     optional: true
 
+  '@esbuild/linux-riscv64@0.25.0':
+    optional: true
+
   '@esbuild/linux-riscv64@0.25.11':
     optional: true
 
@@ -12432,6 +13037,9 @@ snapshots:
   '@esbuild/linux-riscv64@0.27.7':
     optional: true
 
+  '@esbuild/linux-s390x@0.25.0':
+    optional: true
+
   '@esbuild/linux-s390x@0.25.11':
     optional: true
 
@@ -12441,6 +13049,9 @@ snapshots:
   '@esbuild/linux-s390x@0.27.7':
     optional: true
 
+  '@esbuild/linux-x64@0.25.0':
+    optional: true
+
   '@esbuild/linux-x64@0.25.11':
     optional: true
 
@@ -12450,6 +13061,9 @@ snapshots:
   '@esbuild/linux-x64@0.27.7':
     optional: true
 
+  '@esbuild/netbsd-arm64@0.25.0':
+    optional: true
+
   '@esbuild/netbsd-arm64@0.25.11':
     optional: true
 
@@ -12459,6 +13073,9 @@ snapshots:
   '@esbuild/netbsd-arm64@0.27.7':
     optional: true
 
+  '@esbuild/netbsd-x64@0.25.0':
+    optional: true
+
   '@esbuild/netbsd-x64@0.25.11':
     optional: true
 
@@ -12468,6 +13085,9 @@ snapshots:
   '@esbuild/netbsd-x64@0.27.7':
     optional: true
 
+  '@esbuild/openbsd-arm64@0.25.0':
+    optional: true
+
   '@esbuild/openbsd-arm64@0.25.11':
     optional: true
 
@@ -12477,6 +13097,9 @@ snapshots:
   '@esbuild/openbsd-arm64@0.27.7':
     optional: true
 
+  '@esbuild/openbsd-x64@0.25.0':
+    optional: true
+
   '@esbuild/openbsd-x64@0.25.11':
     optional: true
 
@@ -12495,6 +13118,9 @@ snapshots:
   '@esbuild/openharmony-arm64@0.27.7':
     optional: true
 
+  '@esbuild/sunos-x64@0.25.0':
+    optional: true
+
   '@esbuild/sunos-x64@0.25.11':
     optional: true
 
@@ -12504,6 +13130,9 @@ snapshots:
   '@esbuild/sunos-x64@0.27.7':
     optional: true
 
+  '@esbuild/win32-arm64@0.25.0':
+    optional: true
+
   '@esbuild/win32-arm64@0.25.11':
     optional: true
 
@@ -12513,6 +13142,9 @@ snapshots:
   '@esbuild/win32-arm64@0.27.7':
     optional: true
 
+  '@esbuild/win32-ia32@0.25.0':
+    optional: true
+
   '@esbuild/win32-ia32@0.25.11':
     optional: true
 
@@ -12522,6 +13154,9 @@ snapshots:
   '@esbuild/win32-ia32@0.27.7':
     optional: true
 
+  '@esbuild/win32-x64@0.25.0':
+    optional: true
+
   '@esbuild/win32-x64@0.25.11':
     optional: true
 
@@ -12531,6 +13166,11 @@ snapshots:
   '@esbuild/win32-x64@0.27.7':
     optional: true
 
+  '@eslint-community/eslint-utils@4.9.0(eslint@9.39.1(jiti@2.6.1))':
+    dependencies:
+      eslint: 9.39.1(jiti@2.6.1)
+      eslint-visitor-keys: 3.4.3
+
   '@eslint-community/eslint-utils@4.9.1(eslint@9.39.1(jiti@2.6.1))':
     dependencies:
       eslint: 9.39.1(jiti@2.6.1)
@@ -12541,7 +13181,7 @@ snapshots:
   '@eslint/config-array@0.21.1':
     dependencies:
       '@eslint/object-schema': 2.1.7
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
       minimatch: 3.1.5
     transitivePeerDependencies:
       - supports-color
@@ -12561,7 +13201,7 @@ snapshots:
   '@eslint/eslintrc@3.3.3':
     dependencies:
       ajv: 6.15.0
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
       espree: 10.4.0
       globals: 14.0.0
       ignore: 5.3.2
@@ -12617,7 +13257,7 @@ snapshots:
       '@firebase/component': 0.7.0
       '@firebase/logger': 0.5.0
       '@firebase/util': 1.13.0
-      tslib: 2.8.1
+      tslib: 2.6.3
 
   '@firebase/analytics-compat@0.2.24(@firebase/app-compat@0.5.0)(@firebase/app@0.14.0)':
     dependencies:
@@ -12626,7 +13266,7 @@ snapshots:
       '@firebase/app-compat': 0.5.0
       '@firebase/component': 0.7.0
       '@firebase/util': 1.13.0
-      tslib: 2.8.1
+      tslib: 2.6.3
     transitivePeerDependencies:
       - '@firebase/app'
 
@@ -12639,7 +13279,7 @@ snapshots:
       '@firebase/installations': 0.6.19(@firebase/app@0.14.0)
       '@firebase/logger': 0.5.0
       '@firebase/util': 1.13.0
-      tslib: 2.8.1
+      tslib: 2.6.3
 
   '@firebase/app-check-compat@0.4.0(@firebase/app-compat@0.5.0)(@firebase/app@0.14.0)':
     dependencies:
@@ -12649,7 +13289,7 @@ snapshots:
       '@firebase/component': 0.7.0
       '@firebase/logger': 0.5.0
       '@firebase/util': 1.13.0
-      tslib: 2.8.1
+      tslib: 2.6.3
     transitivePeerDependencies:
       - '@firebase/app'
 
@@ -12665,7 +13305,7 @@ snapshots:
       '@firebase/component': 0.7.0
       '@firebase/logger': 0.5.0
       '@firebase/util': 1.13.0
-      tslib: 2.8.1
+      tslib: 2.6.3
 
   '@firebase/app-compat@0.5.0':
     dependencies:
@@ -12673,7 +13313,7 @@ snapshots:
       '@firebase/component': 0.7.0
       '@firebase/logger': 0.5.0
       '@firebase/util': 1.13.0
-      tslib: 2.8.1
+      tslib: 2.6.3
 
   '@firebase/app-types@0.9.2': {}
 
@@ -12685,7 +13325,7 @@ snapshots:
       '@firebase/logger': 0.5.0
       '@firebase/util': 1.13.0
       idb: 7.1.1
-      tslib: 2.8.1
+      tslib: 2.6.3
 
   '@firebase/auth-compat@0.6.0(@firebase/app-compat@0.5.0)(@firebase/app-types@0.9.3)(@firebase/app@0.14.0)':
     dependencies:
@@ -12694,7 +13334,7 @@ snapshots:
       '@firebase/auth-types': 0.13.0(@firebase/app-types@0.9.3)(@firebase/util@1.13.0)
       '@firebase/component': 0.7.0
       '@firebase/util': 1.13.0
-      tslib: 2.8.1
+      tslib: 2.6.3
     transitivePeerDependencies:
       - '@firebase/app'
       - '@firebase/app-types'
@@ -12715,7 +13355,7 @@ snapshots:
       '@firebase/component': 0.7.0
       '@firebase/logger': 0.5.0
       '@firebase/util': 1.13.0
-      tslib: 2.8.1
+      tslib: 2.6.3
 
   '@firebase/component@0.6.8':
     dependencies:
@@ -12734,7 +13374,7 @@ snapshots:
       '@firebase/component': 0.7.0
       '@firebase/logger': 0.5.0
       '@firebase/util': 1.13.0
-      tslib: 2.8.1
+      tslib: 2.6.3
 
   '@firebase/database-compat@1.0.6':
     dependencies:
@@ -12743,7 +13383,7 @@ snapshots:
       '@firebase/database-types': 1.0.4
       '@firebase/logger': 0.4.2
       '@firebase/util': 1.9.7
-      tslib: 2.8.1
+      tslib: 2.6.3
 
   '@firebase/database-compat@2.1.0':
     dependencies:
@@ -12752,7 +13392,7 @@ snapshots:
       '@firebase/database-types': 1.0.16
       '@firebase/logger': 0.5.0
       '@firebase/util': 1.13.0
-      tslib: 2.8.1
+      tslib: 2.6.3
 
   '@firebase/database-types@1.0.16':
     dependencies:
@@ -12782,7 +13422,7 @@ snapshots:
       '@firebase/logger': 0.5.0
       '@firebase/util': 1.13.0
       faye-websocket: 0.11.4
-      tslib: 2.8.1
+      tslib: 2.6.3
 
   '@firebase/firestore-compat@0.4.0(@firebase/app-compat@0.5.0)(@firebase/app-types@0.9.3)(@firebase/app@0.14.0)':
     dependencies:
@@ -12791,7 +13431,7 @@ snapshots:
       '@firebase/firestore': 4.9.0(@firebase/app@0.14.0)
       '@firebase/firestore-types': 3.0.3(@firebase/app-types@0.9.3)(@firebase/util@1.13.0)
       '@firebase/util': 1.13.0
-      tslib: 2.8.1
+      tslib: 2.6.3
     transitivePeerDependencies:
       - '@firebase/app'
       - '@firebase/app-types'
@@ -12810,7 +13450,7 @@ snapshots:
       '@firebase/webchannel-wrapper': 1.0.4
       '@grpc/grpc-js': 1.9.15
       '@grpc/proto-loader': 0.7.13
-      tslib: 2.8.1
+      tslib: 2.6.3
 
   '@firebase/functions-compat@0.4.0(@firebase/app-compat@0.5.0)(@firebase/app@0.14.0)':
     dependencies:
@@ -12819,7 +13459,7 @@ snapshots:
       '@firebase/functions': 0.13.0(@firebase/app@0.14.0)
       '@firebase/functions-types': 0.6.3
       '@firebase/util': 1.13.0
-      tslib: 2.8.1
+      tslib: 2.6.3
     transitivePeerDependencies:
       - '@firebase/app'
 
@@ -12833,7 +13473,7 @@ snapshots:
       '@firebase/component': 0.7.0
       '@firebase/messaging-interop-types': 0.2.3
       '@firebase/util': 1.13.0
-      tslib: 2.8.1
+      tslib: 2.6.3
 
   '@firebase/installations-compat@0.2.19(@firebase/app-compat@0.5.0)(@firebase/app-types@0.9.3)(@firebase/app@0.14.0)':
     dependencies:
@@ -12842,7 +13482,7 @@ snapshots:
       '@firebase/installations': 0.6.19(@firebase/app@0.14.0)
       '@firebase/installations-types': 0.5.3(@firebase/app-types@0.9.3)
       '@firebase/util': 1.13.0
-      tslib: 2.8.1
+      tslib: 2.6.3
     transitivePeerDependencies:
       - '@firebase/app'
       - '@firebase/app-types'
@@ -12857,7 +13497,7 @@ snapshots:
       '@firebase/component': 0.7.0
       '@firebase/util': 1.13.0
       idb: 7.1.1
-      tslib: 2.8.1
+      tslib: 2.6.3
 
   '@firebase/logger@0.4.2':
     dependencies:
@@ -12873,7 +13513,7 @@ snapshots:
       '@firebase/component': 0.7.0
       '@firebase/messaging': 0.12.23(@firebase/app@0.14.0)
       '@firebase/util': 1.13.0
-      tslib: 2.8.1
+      tslib: 2.6.3
     transitivePeerDependencies:
       - '@firebase/app'
 
@@ -12887,7 +13527,7 @@ snapshots:
       '@firebase/messaging-interop-types': 0.2.3
       '@firebase/util': 1.13.0
       idb: 7.1.1
-      tslib: 2.8.1
+      tslib: 2.6.3
 
   '@firebase/performance-compat@0.2.21(@firebase/app-compat@0.5.0)(@firebase/app@0.14.0)':
     dependencies:
@@ -12897,7 +13537,7 @@ snapshots:
       '@firebase/performance': 0.7.8(@firebase/app@0.14.0)
       '@firebase/performance-types': 0.2.3
       '@firebase/util': 1.13.0
-      tslib: 2.8.1
+      tslib: 2.6.3
     transitivePeerDependencies:
       - '@firebase/app'
 
@@ -12910,7 +13550,7 @@ snapshots:
       '@firebase/installations': 0.6.19(@firebase/app@0.14.0)
       '@firebase/logger': 0.5.0
       '@firebase/util': 1.13.0
-      tslib: 2.8.1
+      tslib: 2.6.3
       web-vitals: 4.2.4
 
   '@firebase/remote-config-compat@0.2.19(@firebase/app-compat@0.5.0)(@firebase/app@0.14.0)':
@@ -12921,7 +13561,7 @@ snapshots:
       '@firebase/remote-config': 0.6.6(@firebase/app@0.14.0)
       '@firebase/remote-config-types': 0.4.0
       '@firebase/util': 1.13.0
-      tslib: 2.8.1
+      tslib: 2.6.3
     transitivePeerDependencies:
       - '@firebase/app'
 
@@ -12934,7 +13574,7 @@ snapshots:
       '@firebase/installations': 0.6.19(@firebase/app@0.14.0)
       '@firebase/logger': 0.5.0
       '@firebase/util': 1.13.0
-      tslib: 2.8.1
+      tslib: 2.6.3
 
   '@firebase/storage-compat@0.4.0(@firebase/app-compat@0.5.0)(@firebase/app-types@0.9.3)(@firebase/app@0.14.0)':
     dependencies:
@@ -12943,7 +13583,7 @@ snapshots:
       '@firebase/storage': 0.14.0(@firebase/app@0.14.0)
       '@firebase/storage-types': 0.8.3(@firebase/app-types@0.9.3)(@firebase/util@1.13.0)
       '@firebase/util': 1.13.0
-      tslib: 2.8.1
+      tslib: 2.6.3
     transitivePeerDependencies:
       - '@firebase/app'
       - '@firebase/app-types'
@@ -12958,11 +13598,11 @@ snapshots:
       '@firebase/app': 0.14.0
       '@firebase/component': 0.7.0
       '@firebase/util': 1.13.0
-      tslib: 2.8.1
+      tslib: 2.6.3
 
   '@firebase/util@1.13.0':
     dependencies:
-      tslib: 2.8.1
+      tslib: 2.6.3
 
   '@firebase/util@1.9.7':
     dependencies:
@@ -13032,7 +13672,7 @@ snapshots:
       abort-controller: 3.0.0
       async-retry: 1.3.3
       duplexify: 4.1.3
-      fast-xml-parser: 4.5.3
+      fast-xml-parser: 4.4.1
       gaxios: 6.7.0(encoding@0.1.13)
       google-auth-library: 9.12.0(encoding@0.1.13)
       html-entities: 2.5.2
@@ -13264,7 +13904,7 @@ snapshots:
     dependencies:
       string-width: 5.1.2
       string-width-cjs: string-width@4.2.3
-      strip-ansi: 7.1.2
+      strip-ansi: 7.1.0
       strip-ansi-cjs: strip-ansi@6.0.1
       wrap-ansi: 8.1.0
       wrap-ansi-cjs: wrap-ansi@7.0.0
@@ -13294,6 +13934,13 @@ snapshots:
       '@jridgewell/gen-mapping': 0.3.13
       '@jridgewell/trace-mapping': 0.3.31
 
+  '@jridgewell/source-map@0.3.6':
+    dependencies:
+      '@jridgewell/gen-mapping': 0.3.13
+      '@jridgewell/trace-mapping': 0.3.31
+
+  '@jridgewell/sourcemap-codec@1.5.0': {}
+
   '@jridgewell/sourcemap-codec@1.5.5': {}
 
   '@jridgewell/trace-mapping@0.3.31':
@@ -13315,7 +13962,7 @@ snapshots:
 
   '@kwsites/file-exists@1.1.1':
     dependencies:
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
     transitivePeerDependencies:
       - supports-color
 
@@ -13328,7 +13975,7 @@ snapshots:
       detect-libc: 2.0.3
       https-proxy-agent: 5.0.1
       make-dir: 3.1.0
-      node-fetch: 2.7.0(encoding@0.1.13)
+      node-fetch: 2.6.7(encoding@0.1.13)
       nopt: 5.0.0
       npmlog: 5.0.1
       rimraf: 3.0.2
@@ -13864,7 +14511,7 @@ snapshots:
       https-proxy-agent: 7.0.6
       js-levenshtein: 1.1.6
       js-yaml: 4.1.1
-      minimatch: 5.1.9
+      minimatch: 5.1.6
       pluralize: 8.0.0
       yaml-ast-parser: 0.0.43
     transitivePeerDependencies:
@@ -14000,76 +14647,76 @@ snapshots:
     optionalDependencies:
       rollup: 2.80.0
 
-  '@rollup/rollup-android-arm-eabi@4.52.5':
+  '@rollup/rollup-android-arm-eabi@4.40.0':
     optional: true
 
   '@rollup/rollup-android-arm-eabi@4.60.1':
     optional: true
 
-  '@rollup/rollup-android-arm64@4.52.5':
+  '@rollup/rollup-android-arm64@4.40.0':
     optional: true
 
   '@rollup/rollup-android-arm64@4.60.1':
     optional: true
 
-  '@rollup/rollup-darwin-arm64@4.52.5':
+  '@rollup/rollup-darwin-arm64@4.40.0':
     optional: true
 
   '@rollup/rollup-darwin-arm64@4.60.1':
     optional: true
 
-  '@rollup/rollup-darwin-x64@4.52.5':
+  '@rollup/rollup-darwin-x64@4.40.0':
     optional: true
 
   '@rollup/rollup-darwin-x64@4.60.1':
     optional: true
 
-  '@rollup/rollup-freebsd-arm64@4.52.5':
+  '@rollup/rollup-freebsd-arm64@4.40.0':
     optional: true
 
   '@rollup/rollup-freebsd-arm64@4.60.1':
     optional: true
 
-  '@rollup/rollup-freebsd-x64@4.52.5':
+  '@rollup/rollup-freebsd-x64@4.40.0':
     optional: true
 
   '@rollup/rollup-freebsd-x64@4.60.1':
     optional: true
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.52.5':
+  '@rollup/rollup-linux-arm-gnueabihf@4.40.0':
     optional: true
 
   '@rollup/rollup-linux-arm-gnueabihf@4.60.1':
     optional: true
 
-  '@rollup/rollup-linux-arm-musleabihf@4.52.5':
+  '@rollup/rollup-linux-arm-musleabihf@4.40.0':
     optional: true
 
   '@rollup/rollup-linux-arm-musleabihf@4.60.1':
     optional: true
 
-  '@rollup/rollup-linux-arm64-gnu@4.52.5':
+  '@rollup/rollup-linux-arm64-gnu@4.40.0':
     optional: true
 
   '@rollup/rollup-linux-arm64-gnu@4.60.1':
     optional: true
 
-  '@rollup/rollup-linux-arm64-musl@4.52.5':
+  '@rollup/rollup-linux-arm64-musl@4.40.0':
     optional: true
 
   '@rollup/rollup-linux-arm64-musl@4.60.1':
     optional: true
 
-  '@rollup/rollup-linux-loong64-gnu@4.52.5':
-    optional: true
-
   '@rollup/rollup-linux-loong64-gnu@4.60.1':
     optional: true
 
   '@rollup/rollup-linux-loong64-musl@4.60.1':
     optional: true
 
-  '@rollup/rollup-linux-ppc64-gnu@4.52.5':
+  '@rollup/rollup-linux-loongarch64-gnu@4.40.0':
+    optional: true
+
+  '@rollup/rollup-linux-powerpc64le-gnu@4.40.0':
     optional: true
 
   '@rollup/rollup-linux-ppc64-gnu@4.60.1':
@@ -14078,31 +14725,31 @@ snapshots:
   '@rollup/rollup-linux-ppc64-musl@4.60.1':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-gnu@4.52.5':
+  '@rollup/rollup-linux-riscv64-gnu@4.40.0':
     optional: true
 
   '@rollup/rollup-linux-riscv64-gnu@4.60.1':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-musl@4.52.5':
+  '@rollup/rollup-linux-riscv64-musl@4.40.0':
     optional: true
 
   '@rollup/rollup-linux-riscv64-musl@4.60.1':
     optional: true
 
-  '@rollup/rollup-linux-s390x-gnu@4.52.5':
+  '@rollup/rollup-linux-s390x-gnu@4.40.0':
     optional: true
 
   '@rollup/rollup-linux-s390x-gnu@4.60.1':
     optional: true
 
-  '@rollup/rollup-linux-x64-gnu@4.52.5':
+  '@rollup/rollup-linux-x64-gnu@4.40.0':
     optional: true
 
   '@rollup/rollup-linux-x64-gnu@4.60.1':
     optional: true
 
-  '@rollup/rollup-linux-x64-musl@4.52.5':
+  '@rollup/rollup-linux-x64-musl@4.40.0':
     optional: true
 
   '@rollup/rollup-linux-x64-musl@4.60.1':
@@ -14111,31 +14758,25 @@ snapshots:
   '@rollup/rollup-openbsd-x64@4.60.1':
     optional: true
 
-  '@rollup/rollup-openharmony-arm64@4.52.5':
-    optional: true
-
   '@rollup/rollup-openharmony-arm64@4.60.1':
     optional: true
 
-  '@rollup/rollup-win32-arm64-msvc@4.52.5':
+  '@rollup/rollup-win32-arm64-msvc@4.40.0':
     optional: true
 
   '@rollup/rollup-win32-arm64-msvc@4.60.1':
     optional: true
 
-  '@rollup/rollup-win32-ia32-msvc@4.52.5':
+  '@rollup/rollup-win32-ia32-msvc@4.40.0':
     optional: true
 
   '@rollup/rollup-win32-ia32-msvc@4.60.1':
     optional: true
 
-  '@rollup/rollup-win32-x64-gnu@4.52.5':
-    optional: true
-
   '@rollup/rollup-win32-x64-gnu@4.60.1':
     optional: true
 
-  '@rollup/rollup-win32-x64-msvc@4.52.5':
+  '@rollup/rollup-win32-x64-msvc@4.40.0':
     optional: true
 
   '@rollup/rollup-win32-x64-msvc@4.60.1':
@@ -14209,7 +14850,7 @@ snapshots:
   '@sentry/cli@2.58.5(encoding@0.1.13)':
     dependencies:
       https-proxy-agent: 5.0.1
-      node-fetch: 2.7.0(encoding@0.1.13)
+      node-fetch: 2.6.7(encoding@0.1.13)
       progress: 2.0.3
       proxy-from-env: 1.1.0
       which: 2.0.2
@@ -14281,7 +14922,7 @@ snapshots:
       '@solid-primitives/rootless': 1.5.3(solid-js@1.9.10)
       '@solid-primitives/scheduled': 1.5.3(solid-js@1.9.10)
       '@solid-primitives/static-store': 0.1.3(solid-js@1.9.10)
-      '@solid-primitives/utils': 6.4.0(solid-js@1.9.10)
+      '@solid-primitives/utils': 6.3.2(solid-js@1.9.10)
       solid-js: 1.9.10
 
   '@solid-devtools/frontend@0.15.4(solid-js@1.9.10)':
@@ -14306,7 +14947,7 @@ snapshots:
       '@solid-primitives/static-store': 0.1.3(solid-js@1.9.10)
       '@solid-primitives/styles': 0.1.3(solid-js@1.9.10)
       '@solid-primitives/timer': 1.4.4(solid-js@1.9.10)
-      '@solid-primitives/utils': 6.4.0(solid-js@1.9.10)
+      '@solid-primitives/utils': 6.3.2(solid-js@1.9.10)
       clsx: 2.1.1
       solid-js: 1.9.10
 
@@ -14319,7 +14960,7 @@ snapshots:
       '@solid-primitives/cursor': 0.1.3(solid-js@1.9.10)
       '@solid-primitives/event-listener': 2.4.5(solid-js@1.9.10)
       '@solid-primitives/media': 2.3.5(solid-js@1.9.10)
-      '@solid-primitives/utils': 6.4.0(solid-js@1.9.10)
+      '@solid-primitives/utils': 6.3.2(solid-js@1.9.10)
       solid-js: 1.9.10
 
   '@solid-devtools/shared@0.20.0(solid-js@1.9.10)':
@@ -14332,7 +14973,7 @@ snapshots:
       '@solid-primitives/scheduled': 1.5.3(solid-js@1.9.10)
       '@solid-primitives/static-store': 0.1.3(solid-js@1.9.10)
       '@solid-primitives/styles': 0.1.3(solid-js@1.9.10)
-      '@solid-primitives/utils': 6.4.0(solid-js@1.9.10)
+      '@solid-primitives/utils': 6.3.2(solid-js@1.9.10)
       solid-js: 1.9.10
 
   '@solid-primitives/bounds@0.1.5(solid-js@1.9.10)':
@@ -14424,7 +15065,7 @@ snapshots:
 
   '@solid-primitives/refs@1.1.2(solid-js@1.9.10)':
     dependencies:
-      '@solid-primitives/utils': 6.4.0(solid-js@1.9.10)
+      '@solid-primitives/utils': 6.3.2(solid-js@1.9.10)
       solid-js: 1.9.10
 
   '@solid-primitives/resize-observer@2.1.5(solid-js@1.9.10)':
@@ -14468,6 +15109,10 @@ snapshots:
       '@solid-primitives/utils': 6.4.0(solid-js@1.9.10)
       solid-js: 1.9.10
 
+  '@solid-primitives/utils@6.3.2(solid-js@1.9.10)':
+    dependencies:
+      solid-js: 1.9.10
+
   '@solid-primitives/utils@6.4.0(solid-js@1.9.10)':
     dependencies:
       solid-js: 1.9.10
@@ -14646,31 +15291,31 @@ snapshots:
       tailwindcss: 4.2.1
       vite: 8.0.5(@emnapi/core@1.9.0)(@emnapi/runtime@1.9.0)(@types/node@24.9.1)(esbuild@0.27.7)(jiti@2.6.1)(sass@1.70.0)(terser@5.46.2)(tsx@4.21.0)(yaml@2.8.3)
 
-  '@tanstack/db-ivm@0.1.17(typescript@6.0.2)':
+  '@tanstack/db-ivm@0.1.18(typescript@6.0.2)':
     dependencies:
       fractional-indexing: 3.2.0
       sorted-btree: 1.8.1
       typescript: 6.0.2
 
-  '@tanstack/db@0.5.30(typescript@6.0.2)':
+  '@tanstack/db@0.6.5(typescript@6.0.2)':
     dependencies:
       '@standard-schema/spec': 1.1.0
-      '@tanstack/db-ivm': 0.1.17(typescript@6.0.2)
+      '@tanstack/db-ivm': 0.1.18(typescript@6.0.2)
       '@tanstack/pacer-lite': 0.2.1
       typescript: 6.0.2
 
   '@tanstack/devtools-client@0.0.6':
     dependencies:
-      '@tanstack/devtools-event-client': 0.4.1
+      '@tanstack/devtools-event-client': 0.4.3
 
   '@tanstack/devtools-event-bus@0.4.1':
     dependencies:
-      ws: 8.19.0
+      ws: 8.20.0
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
 
-  '@tanstack/devtools-event-client@0.4.1': {}
+  '@tanstack/devtools-event-client@0.4.3': {}
 
   '@tanstack/devtools-ui@0.5.1(csstype@3.2.3)(solid-js@1.9.10)':
     dependencies:
@@ -14681,12 +15326,12 @@ snapshots:
     transitivePeerDependencies:
       - csstype
 
-  '@tanstack/devtools-ui@0.5.1(csstype@3.2.3)(solid-js@1.9.11)':
+  '@tanstack/devtools-ui@0.5.1(csstype@3.2.3)(solid-js@1.9.12)':
     dependencies:
       clsx: 2.1.1
       dayjs: 1.11.20
       goober: 2.1.18(csstype@3.2.3)
-      solid-js: 1.9.11
+      solid-js: 1.9.12
     transitivePeerDependencies:
       - csstype
 
@@ -14696,13 +15341,13 @@ snapshots:
       react: 18.3.1
       solid-js: 1.9.10
 
-  '@tanstack/devtools-utils@0.4.0(@types/react@19.2.14)(react@18.3.1)(solid-js@1.9.11)':
+  '@tanstack/devtools-utils@0.4.0(@types/react@19.2.14)(react@18.3.1)(solid-js@1.9.12)':
     optionalDependencies:
       '@types/react': 19.2.14
       react: 18.3.1
-      solid-js: 1.9.11
+      solid-js: 1.9.12
 
-  '@tanstack/devtools@0.11.0(csstype@3.2.3)(solid-js@1.9.10)':
+  '@tanstack/devtools@0.11.2(csstype@3.2.3)(solid-js@1.9.10)':
     dependencies:
       '@solid-primitives/event-listener': 2.4.5(solid-js@1.9.10)
       '@solid-primitives/keyboard': 1.3.5(solid-js@1.9.10)
@@ -14718,29 +15363,30 @@ snapshots:
       - csstype
       - utf-8-validate
 
-  '@tanstack/eslint-plugin-query@5.91.4(eslint@9.39.1(jiti@2.6.1))(typescript@6.0.2)':
+  '@tanstack/eslint-plugin-query@5.100.3(eslint@9.39.1(jiti@2.6.1))(typescript@6.0.2)':
     dependencies:
-      '@typescript-eslint/utils': 8.52.0(eslint@9.39.1(jiti@2.6.1))(typescript@6.0.2)
+      '@typescript-eslint/utils': 8.59.0(eslint@9.39.1(jiti@2.6.1))(typescript@6.0.2)
       eslint: 9.39.1(jiti@2.6.1)
     optionalDependencies:
       typescript: 6.0.2
     transitivePeerDependencies:
       - supports-color
 
-  '@tanstack/form-core@1.28.4':
+  '@tanstack/form-core@1.29.1':
     dependencies:
-      '@tanstack/devtools-event-client': 0.4.1
+      '@tanstack/devtools-event-client': 0.4.3
       '@tanstack/pacer-lite': 0.1.1
-      '@tanstack/store': 0.9.2
+      '@tanstack/store': 0.9.3
 
-  '@tanstack/hotkeys-devtools@0.4.3(@tanstack/hotkeys@0.4.2)(@types/react@19.2.14)(csstype@3.2.3)(react@18.3.1)':
+  '@tanstack/hotkeys-devtools@0.8.1(@tanstack/hotkeys@0.7.1)(@types/react@19.2.14)(csstype@3.2.3)(react@18.3.1)':
     dependencies:
-      '@tanstack/devtools-ui': 0.5.1(csstype@3.2.3)(solid-js@1.9.11)
-      '@tanstack/devtools-utils': 0.4.0(@types/react@19.2.14)(react@18.3.1)(solid-js@1.9.11)
-      '@tanstack/hotkeys': 0.4.2
+      '@tanstack/devtools-ui': 0.5.1(csstype@3.2.3)(solid-js@1.9.12)
+      '@tanstack/devtools-utils': 0.4.0(@types/react@19.2.14)(react@18.3.1)(solid-js@1.9.12)
+      '@tanstack/hotkeys': 0.7.1
       clsx: 2.1.1
       goober: 2.1.18(csstype@3.2.3)
-      solid-js: 1.9.11
+      match-sorter: 8.3.0
+      solid-js: 1.9.12
     transitivePeerDependencies:
       - '@types/react'
       - csstype
@@ -14748,52 +15394,52 @@ snapshots:
       - react
       - vue
 
-  '@tanstack/hotkeys@0.4.2':
+  '@tanstack/hotkeys@0.7.1':
     dependencies:
-      '@tanstack/store': 0.9.2
+      '@tanstack/store': 0.9.3
 
   '@tanstack/pacer-lite@0.1.1': {}
 
   '@tanstack/pacer-lite@0.2.1': {}
 
-  '@tanstack/query-core@5.90.20': {}
+  '@tanstack/query-core@5.100.3': {}
 
-  '@tanstack/query-db-collection@1.0.27(@tanstack/query-core@5.90.20)(typescript@6.0.2)':
+  '@tanstack/query-db-collection@1.0.36(@tanstack/query-core@5.100.3)(typescript@6.0.2)':
     dependencies:
       '@standard-schema/spec': 1.1.0
-      '@tanstack/db': 0.5.30(typescript@6.0.2)
-      '@tanstack/query-core': 5.90.20
+      '@tanstack/db': 0.6.5(typescript@6.0.2)
+      '@tanstack/query-core': 5.100.3
       typescript: 6.0.2
 
-  '@tanstack/query-devtools@5.93.0': {}
+  '@tanstack/query-devtools@5.100.3': {}
 
-  '@tanstack/solid-db@0.2.10(solid-js@1.9.10)(typescript@6.0.2)':
+  '@tanstack/solid-db@0.2.19(solid-js@1.9.10)(typescript@6.0.2)':
     dependencies:
       '@solid-primitives/map': 0.7.3(solid-js@1.9.10)
-      '@tanstack/db': 0.5.30(typescript@6.0.2)
+      '@tanstack/db': 0.6.5(typescript@6.0.2)
       solid-js: 1.9.10
     transitivePeerDependencies:
       - typescript
 
-  '@tanstack/solid-devtools@0.8.0(csstype@3.2.3)(solid-js@1.9.10)':
+  '@tanstack/solid-devtools@0.8.2(csstype@3.2.3)(solid-js@1.9.10)':
     dependencies:
-      '@tanstack/devtools': 0.11.0(csstype@3.2.3)(solid-js@1.9.10)
+      '@tanstack/devtools': 0.11.2(csstype@3.2.3)(solid-js@1.9.10)
       solid-js: 1.9.10
     transitivePeerDependencies:
       - bufferutil
       - csstype
       - utf-8-validate
 
-  '@tanstack/solid-form@1.28.4(solid-js@1.9.10)':
+  '@tanstack/solid-form@1.29.1(solid-js@1.9.10)':
     dependencies:
-      '@tanstack/form-core': 1.28.4
-      '@tanstack/solid-store': 0.9.2(solid-js@1.9.10)
+      '@tanstack/form-core': 1.29.1
+      '@tanstack/solid-store': 0.9.3(solid-js@1.9.10)
       solid-js: 1.9.10
 
-  '@tanstack/solid-hotkeys-devtools@0.4.3(@tanstack/hotkeys@0.4.2)(@types/react@19.2.14)(csstype@3.2.3)(react@18.3.1)(solid-js@1.9.10)':
+  '@tanstack/solid-hotkeys-devtools@0.6.6(@tanstack/hotkeys@0.7.1)(@types/react@19.2.14)(csstype@3.2.3)(react@18.3.1)(solid-js@1.9.10)':
     dependencies:
       '@tanstack/devtools-utils': 0.4.0(@types/react@19.2.14)(react@18.3.1)(solid-js@1.9.10)
-      '@tanstack/hotkeys-devtools': 0.4.3(@tanstack/hotkeys@0.4.2)(@types/react@19.2.14)(csstype@3.2.3)(react@18.3.1)
+      '@tanstack/hotkeys-devtools': 0.8.1(@tanstack/hotkeys@0.7.1)(@types/react@19.2.14)(csstype@3.2.3)(react@18.3.1)
       solid-js: 1.9.10
     transitivePeerDependencies:
       - '@tanstack/hotkeys'
@@ -14803,26 +15449,26 @@ snapshots:
       - react
       - vue
 
-  '@tanstack/solid-hotkeys@0.4.2(solid-js@1.9.10)':
+  '@tanstack/solid-hotkeys@0.9.1(solid-js@1.9.10)':
     dependencies:
-      '@tanstack/hotkeys': 0.4.2
-      '@tanstack/solid-store': 0.9.2(solid-js@1.9.10)
+      '@tanstack/hotkeys': 0.7.1
+      '@tanstack/solid-store': 0.9.3(solid-js@1.9.10)
       solid-js: 1.9.10
 
-  '@tanstack/solid-query-devtools@5.91.3(@tanstack/solid-query@5.90.23(solid-js@1.9.10))(solid-js@1.9.10)':
+  '@tanstack/solid-query-devtools@5.100.3(@tanstack/solid-query@5.100.3(solid-js@1.9.10))(solid-js@1.9.10)':
     dependencies:
-      '@tanstack/query-devtools': 5.93.0
-      '@tanstack/solid-query': 5.90.23(solid-js@1.9.10)
+      '@tanstack/query-devtools': 5.100.3
+      '@tanstack/solid-query': 5.100.3(solid-js@1.9.10)
       solid-js: 1.9.10
 
-  '@tanstack/solid-query@5.90.23(solid-js@1.9.10)':
+  '@tanstack/solid-query@5.100.3(solid-js@1.9.10)':
     dependencies:
-      '@tanstack/query-core': 5.90.20
+      '@tanstack/query-core': 5.100.3
       solid-js: 1.9.10
 
-  '@tanstack/solid-store@0.9.2(solid-js@1.9.10)':
+  '@tanstack/solid-store@0.9.3(solid-js@1.9.10)':
     dependencies:
-      '@tanstack/store': 0.9.2
+      '@tanstack/store': 0.9.3
       solid-js: 1.9.10
 
   '@tanstack/solid-table@8.21.3(solid-js@1.9.10)':
@@ -14830,14 +15476,14 @@ snapshots:
       '@tanstack/table-core': 8.21.3
       solid-js: 1.9.10
 
-  '@tanstack/store@0.9.2': {}
+  '@tanstack/store@0.9.3': {}
 
   '@tanstack/table-core@8.21.3': {}
 
   '@testing-library/dom@10.4.1':
     dependencies:
-      '@babel/code-frame': 7.28.6
-      '@babel/runtime': 7.28.6
+      '@babel/code-frame': 7.27.1
+      '@babel/runtime': 7.28.4
       '@types/aria-query': 5.0.4
       aria-query: 5.3.0
       dom-accessibility-api: 0.5.16
@@ -14905,8 +15551,8 @@ snapshots:
 
   '@types/babel__core@7.20.5':
     dependencies:
-      '@babel/parser': 7.28.6
-      '@babel/types': 7.28.6
+      '@babel/parser': 7.28.5
+      '@babel/types': 7.28.5
       '@types/babel__generator': 7.27.0
       '@types/babel__template': 7.4.4
       '@types/babel__traverse': 7.28.0
@@ -14980,6 +15626,8 @@ snapshots:
 
   '@types/estree@0.0.39': {}
 
+  '@types/estree@1.0.7': {}
+
   '@types/estree@1.0.8': {}
 
   '@types/express-serve-static-core@4.19.5':
@@ -15165,7 +15813,16 @@ snapshots:
     dependencies:
       '@typescript-eslint/tsconfig-utils': 8.52.0(typescript@6.0.2)
       '@typescript-eslint/types': 8.52.0
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
+      typescript: 6.0.2
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/project-service@8.59.0(typescript@6.0.2)':
+    dependencies:
+      '@typescript-eslint/tsconfig-utils': 8.59.0(typescript@6.0.2)
+      '@typescript-eslint/types': 8.59.0
+      debug: 4.4.3
       typescript: 6.0.2
     transitivePeerDependencies:
       - supports-color
@@ -15175,19 +15832,30 @@ snapshots:
       '@typescript-eslint/types': 8.52.0
       '@typescript-eslint/visitor-keys': 8.52.0
 
+  '@typescript-eslint/scope-manager@8.59.0':
+    dependencies:
+      '@typescript-eslint/types': 8.59.0
+      '@typescript-eslint/visitor-keys': 8.59.0
+
   '@typescript-eslint/tsconfig-utils@8.52.0(typescript@6.0.2)':
     dependencies:
       typescript: 6.0.2
 
+  '@typescript-eslint/tsconfig-utils@8.59.0(typescript@6.0.2)':
+    dependencies:
+      typescript: 6.0.2
+
   '@typescript-eslint/types@7.18.0': {}
 
   '@typescript-eslint/types@8.52.0': {}
 
+  '@typescript-eslint/types@8.59.0': {}
+
   '@typescript-eslint/typescript-estree@7.18.0(typescript@5.9.3)':
     dependencies:
       '@typescript-eslint/types': 7.18.0
       '@typescript-eslint/visitor-keys': 7.18.0
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
       globby: 11.1.0
       is-glob: 4.0.3
       minimatch: 9.0.9
@@ -15204,7 +15872,7 @@ snapshots:
       '@typescript-eslint/tsconfig-utils': 8.52.0(typescript@6.0.2)
       '@typescript-eslint/types': 8.52.0
       '@typescript-eslint/visitor-keys': 8.52.0
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
       minimatch: 9.0.9
       semver: 7.7.4
       tinyglobby: 0.2.15
@@ -15213,6 +15881,21 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@typescript-eslint/typescript-estree@8.59.0(typescript@6.0.2)':
+    dependencies:
+      '@typescript-eslint/project-service': 8.59.0(typescript@6.0.2)
+      '@typescript-eslint/tsconfig-utils': 8.59.0(typescript@6.0.2)
+      '@typescript-eslint/types': 8.59.0
+      '@typescript-eslint/visitor-keys': 8.59.0
+      debug: 4.4.3
+      minimatch: 10.2.5
+      semver: 7.7.4
+      tinyglobby: 0.2.16
+      ts-api-utils: 2.5.0(typescript@6.0.2)
+      typescript: 6.0.2
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/utils@8.52.0(eslint@9.39.1(jiti@2.6.1))(typescript@6.0.2)':
     dependencies:
       '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.1(jiti@2.6.1))
@@ -15224,6 +15907,17 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@typescript-eslint/utils@8.59.0(eslint@9.39.1(jiti@2.6.1))(typescript@6.0.2)':
+    dependencies:
+      '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.1(jiti@2.6.1))
+      '@typescript-eslint/scope-manager': 8.59.0
+      '@typescript-eslint/types': 8.59.0
+      '@typescript-eslint/typescript-estree': 8.59.0(typescript@6.0.2)
+      eslint: 9.39.1(jiti@2.6.1)
+      typescript: 6.0.2
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/visitor-keys@7.18.0':
     dependencies:
       '@typescript-eslint/types': 7.18.0
@@ -15234,6 +15928,11 @@ snapshots:
       '@typescript-eslint/types': 8.52.0
       eslint-visitor-keys: 4.2.1
 
+  '@typescript-eslint/visitor-keys@8.59.0':
+    dependencies:
+      '@typescript-eslint/types': 8.59.0
+      eslint-visitor-keys: 5.0.1
+
   '@vitest/browser-playwright@4.0.18(playwright@1.58.2)(vite@7.3.2(@types/node@24.9.1)(jiti@2.6.1)(lightningcss@1.32.0)(sass@1.98.0)(terser@5.46.2)(tsx@4.21.0)(yaml@2.8.3))(vitest@4.1.0)':
     dependencies:
       '@vitest/browser': 4.0.18(vite@7.3.2(@types/node@24.9.1)(jiti@2.6.1)(lightningcss@1.32.0)(sass@1.98.0)(terser@5.46.2)(tsx@4.21.0)(yaml@2.8.3))(vitest@4.1.0)
@@ -15355,13 +16054,13 @@ snapshots:
     optionalDependencies:
       vite: 7.3.2(@types/node@24.9.1)(jiti@2.6.1)(lightningcss@1.32.0)(sass@1.98.0)(terser@5.46.2)(tsx@4.21.0)(yaml@2.8.3)
 
-  '@vitest/mocker@4.1.0(vite@8.0.5(@emnapi/core@1.9.0)(@emnapi/runtime@1.9.0)(@types/node@24.9.1)(esbuild@0.25.11)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.2)(tsx@4.21.0)(yaml@2.8.3))':
+  '@vitest/mocker@4.1.0(vite@8.0.5(@emnapi/core@1.9.0)(@emnapi/runtime@1.9.0)(@types/node@24.9.1)(esbuild@0.25.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.2)(tsx@4.21.0)(yaml@2.8.3))':
     dependencies:
       '@vitest/spy': 4.1.0
       estree-walker: 3.0.3
       magic-string: 0.30.21
     optionalDependencies:
-      vite: 8.0.5(@emnapi/core@1.9.0)(@emnapi/runtime@1.9.0)(@types/node@24.9.1)(esbuild@0.25.11)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.2)(tsx@4.21.0)(yaml@2.8.3)
+      vite: 8.0.5(@emnapi/core@1.9.0)(@emnapi/runtime@1.9.0)(@types/node@24.9.1)(esbuild@0.25.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.2)(tsx@4.21.0)(yaml@2.8.3)
 
   '@vitest/mocker@4.1.0(vite@8.0.5(@emnapi/core@1.9.0)(@emnapi/runtime@1.9.0)(@types/node@24.9.1)(esbuild@0.27.7)(jiti@2.6.1)(sass@1.70.0)(terser@5.46.2)(tsx@4.21.0)(yaml@2.8.3))':
     dependencies:
@@ -15502,6 +16201,8 @@ snapshots:
     dependencies:
       acorn: 8.15.0
 
+  acorn@8.14.0: {}
+
   acorn@8.15.0: {}
 
   acorn@8.16.0: {}
@@ -15510,7 +16211,13 @@ snapshots:
 
   agent-base@6.0.2:
     dependencies:
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
+    transitivePeerDependencies:
+      - supports-color
+
+  agent-base@7.1.1:
+    dependencies:
+      debug: 4.4.3
     transitivePeerDependencies:
       - supports-color
 
@@ -15700,6 +16407,8 @@ snapshots:
     dependencies:
       lodash: 4.17.21
 
+  async@3.2.5: {}
+
   async@3.2.6: {}
 
   asynckit@0.4.0: {}
@@ -15724,7 +16433,7 @@ snapshots:
   avvio@7.2.5:
     dependencies:
       archy: 1.0.0
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
       fastq: 1.19.1
       queue-microtask: 1.2.3
     transitivePeerDependencies:
@@ -15732,16 +16441,25 @@ snapshots:
 
   axe-core@4.11.1: {}
 
-  axios@1.7.4(debug@4.4.3):
+  axios@1.7.4(debug@4.3.6):
     dependencies:
-      follow-redirects: 1.15.6(debug@4.4.3)
-      form-data: 4.0.4
+      follow-redirects: 1.15.6(debug@4.3.6)
+      form-data: 4.0.0
       proxy-from-env: 1.1.0
     transitivePeerDependencies:
       - debug
 
   b4a@1.6.6: {}
 
+  babel-plugin-jsx-dom-expressions@0.40.3(@babel/core@7.28.5):
+    dependencies:
+      '@babel/core': 7.28.5
+      '@babel/helper-module-imports': 7.18.6
+      '@babel/plugin-syntax-jsx': 7.27.1(@babel/core@7.28.5)
+      '@babel/types': 7.29.0
+      html-entities: 2.3.3
+      parse5: 7.1.2
+
   babel-plugin-jsx-dom-expressions@0.40.3(@babel/core@7.28.6):
     dependencies:
       '@babel/core': 7.28.6
@@ -15775,19 +16493,19 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  babel-preset-solid@1.9.10(@babel/core@7.28.6)(solid-js@1.9.10):
+  babel-preset-solid@1.9.10(@babel/core@7.28.5)(solid-js@1.9.11):
     dependencies:
-      '@babel/core': 7.28.6
-      babel-plugin-jsx-dom-expressions: 0.40.3(@babel/core@7.28.6)
+      '@babel/core': 7.28.5
+      babel-plugin-jsx-dom-expressions: 0.40.3(@babel/core@7.28.5)
     optionalDependencies:
-      solid-js: 1.9.10
+      solid-js: 1.9.11
 
-  babel-preset-solid@1.9.10(@babel/core@7.28.6)(solid-js@1.9.11):
+  babel-preset-solid@1.9.10(@babel/core@7.28.6)(solid-js@1.9.10):
     dependencies:
       '@babel/core': 7.28.6
       babel-plugin-jsx-dom-expressions: 0.40.3(@babel/core@7.28.6)
     optionalDependencies:
-      solid-js: 1.9.11
+      solid-js: 1.9.10
 
   babylon@6.18.0: {}
 
@@ -15875,6 +16593,23 @@ snapshots:
       inherits: 2.0.4
       readable-stream: 3.6.2
 
+  body-parser@1.20.2:
+    dependencies:
+      bytes: 3.1.2
+      content-type: 1.0.5
+      debug: 2.6.9
+      depd: 2.0.0
+      destroy: 1.2.0
+      http-errors: 2.0.0
+      iconv-lite: 0.4.24
+      on-finished: 2.4.1
+      qs: 6.11.0
+      raw-body: 2.5.2
+      type-is: 1.6.18
+      unpipe: 1.0.0
+    transitivePeerDependencies:
+      - supports-color
+
   body-parser@1.20.3:
     dependencies:
       bytes: 3.1.2
@@ -15896,7 +16631,7 @@ snapshots:
     dependencies:
       bytes: 3.1.2
       content-type: 1.0.5
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
       http-errors: 2.0.0
       iconv-lite: 0.7.0
       on-finished: 2.4.1
@@ -15928,19 +16663,35 @@ snapshots:
     dependencies:
       balanced-match: 1.0.2
 
+  brace-expansion@2.1.0:
+    dependencies:
+      balanced-match: 1.0.2
+
   brace-expansion@5.0.4:
     dependencies:
       balanced-match: 4.0.4
 
+  brace-expansion@5.0.5:
+    dependencies:
+      balanced-match: 4.0.4
+
   braces@3.0.3:
     dependencies:
       fill-range: 7.1.1
 
+  browserslist@4.28.0:
+    dependencies:
+      baseline-browser-mapping: 2.9.11
+      caniuse-lite: 1.0.30001762
+      electron-to-chromium: 1.5.267
+      node-releases: 2.0.27
+      update-browserslist-db: 1.2.3(browserslist@4.28.0)
+
   browserslist@4.28.1:
     dependencies:
       baseline-browser-mapping: 2.9.11
       caniuse-lite: 1.0.30001778
-      electron-to-chromium: 1.5.302
+      electron-to-chromium: 1.5.267
       node-releases: 2.0.27
       update-browserslist-db: 1.2.3(browserslist@4.28.1)
 
@@ -15973,8 +16724,8 @@ snapshots:
       ioredis: 5.4.1
       lodash: 4.17.21
       msgpackr: 1.11.0
-      semver: 7.7.3
-      tslib: 2.8.1
+      semver: 7.6.3
+      tslib: 2.6.3
       uuid: 9.0.1
     transitivePeerDependencies:
       - supports-color
@@ -15983,9 +16734,9 @@ snapshots:
     dependencies:
       run-applescript: 7.1.0
 
-  bundle-require@5.1.0(esbuild@0.25.11):
+  bundle-require@5.1.0(esbuild@0.25.0):
     dependencies:
-      esbuild: 0.25.11
+      esbuild: 0.25.0
       load-tsconfig: 0.2.5
 
   byline@5.0.0: {}
@@ -16002,7 +16753,7 @@ snapshots:
       fs-minipass: 3.0.3
       glob: 10.4.5
       lru-cache: 10.4.3
-      minipass: 7.1.3
+      minipass: 7.1.2
       minipass-collect: 2.0.1
       minipass-flush: 1.0.5
       minipass-pipeline: 1.2.4
@@ -16025,6 +16776,14 @@ snapshots:
       es-errors: 1.3.0
       function-bind: 1.1.2
 
+  call-bind@1.0.7:
+    dependencies:
+      es-define-property: 1.0.1
+      es-errors: 1.3.0
+      function-bind: 1.1.2
+      get-intrinsic: 1.3.0
+      set-function-length: 1.2.2
+
   call-bind@1.0.9:
     dependencies:
       call-bind-apply-helpers: 1.0.2
@@ -16055,6 +16814,8 @@ snapshots:
 
   camelize@1.0.1: {}
 
+  caniuse-lite@1.0.30001762: {}
+
   caniuse-lite@1.0.30001778: {}
 
   canvas-confetti@1.5.1: {}
@@ -16093,7 +16854,7 @@ snapshots:
     dependencies:
       chart.js: 3.7.1
 
-  chartjs-plugin-trendline@3.2.0: {}
+  chartjs-plugin-trendline@3.2.4: {}
 
   check-error@2.1.3: {}
 
@@ -16484,7 +17245,7 @@ snapshots:
     dependencies:
       env-paths: 2.2.1
       import-fresh: 3.3.1
-      js-yaml: 4.1.1
+      js-yaml: 4.1.0
       parse-json: 5.2.0
     optionalDependencies:
       typescript: 6.0.2
@@ -16522,6 +17283,12 @@ snapshots:
       shebang-command: 1.2.0
       which: 1.3.1
 
+  cross-spawn@7.0.3:
+    dependencies:
+      path-key: 3.1.1
+      shebang-command: 2.0.0
+      which: 2.0.2
+
   cross-spawn@7.0.6:
     dependencies:
       path-key: 3.1.1
@@ -16604,7 +17371,7 @@ snapshots:
 
   date-fns@2.30.0:
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.28.4
 
   date-fns@3.6.0: {}
 
@@ -16622,12 +17389,20 @@ snapshots:
     dependencies:
       ms: 2.1.2
 
-  debug@4.4.3(supports-color@5.5.0):
+  debug@4.3.6(supports-color@5.5.0):
     dependencies:
-      ms: 2.1.3
+      ms: 2.1.2
     optionalDependencies:
       supports-color: 5.5.0
 
+  debug@4.4.1:
+    dependencies:
+      ms: 2.1.3
+
+  debug@4.4.3:
+    dependencies:
+      ms: 2.1.3
+
   decimal.js@10.6.0: {}
 
   decko@1.2.0: {}
@@ -16783,7 +17558,7 @@ snapshots:
 
   docker-modem@5.0.6:
     dependencies:
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
       readable-stream: 3.6.2
       split-ca: 1.0.1
       ssh2: 1.16.0
@@ -16901,7 +17676,7 @@ snapshots:
     dependencies:
       jake: 10.9.4
 
-  electron-to-chromium@1.5.302: {}
+  electron-to-chromium@1.5.267: {}
 
   emoji-regex@8.0.0: {}
 
@@ -16924,6 +17699,11 @@ snapshots:
     dependencies:
       once: 1.4.0
 
+  enhanced-resolve@5.17.1:
+    dependencies:
+      graceful-fs: 4.2.11
+      tapable: 2.2.1
+
   enhanced-resolve@5.20.0:
     dependencies:
       graceful-fs: 4.2.11
@@ -17034,6 +17814,34 @@ snapshots:
 
   es6-promise@3.3.1: {}
 
+  esbuild@0.25.0:
+    optionalDependencies:
+      '@esbuild/aix-ppc64': 0.25.0
+      '@esbuild/android-arm': 0.25.0
+      '@esbuild/android-arm64': 0.25.0
+      '@esbuild/android-x64': 0.25.0
+      '@esbuild/darwin-arm64': 0.25.0
+      '@esbuild/darwin-x64': 0.25.0
+      '@esbuild/freebsd-arm64': 0.25.0
+      '@esbuild/freebsd-x64': 0.25.0
+      '@esbuild/linux-arm': 0.25.0
+      '@esbuild/linux-arm64': 0.25.0
+      '@esbuild/linux-ia32': 0.25.0
+      '@esbuild/linux-loong64': 0.25.0
+      '@esbuild/linux-mips64el': 0.25.0
+      '@esbuild/linux-ppc64': 0.25.0
+      '@esbuild/linux-riscv64': 0.25.0
+      '@esbuild/linux-s390x': 0.25.0
+      '@esbuild/linux-x64': 0.25.0
+      '@esbuild/netbsd-arm64': 0.25.0
+      '@esbuild/netbsd-x64': 0.25.0
+      '@esbuild/openbsd-arm64': 0.25.0
+      '@esbuild/openbsd-x64': 0.25.0
+      '@esbuild/sunos-x64': 0.25.0
+      '@esbuild/win32-arm64': 0.25.0
+      '@esbuild/win32-ia32': 0.25.0
+      '@esbuild/win32-x64': 0.25.0
+
   esbuild@0.25.11:
     optionalDependencies:
       '@esbuild/aix-ppc64': 0.25.11
@@ -17145,7 +17953,7 @@ snapshots:
     dependencies:
       '@mdn/browser-compat-data': 6.1.5
       ast-metadata-inferer: 0.8.1
-      browserslist: 4.28.1
+      browserslist: 4.28.0
       eslint: 9.39.1(jiti@2.6.1)
       find-up: 5.0.0
       globals: 15.15.0
@@ -17174,9 +17982,11 @@ snapshots:
 
   eslint-visitor-keys@4.2.1: {}
 
+  eslint-visitor-keys@5.0.1: {}
+
   eslint@9.39.1(jiti@2.6.1):
     dependencies:
-      '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.1(jiti@2.6.1))
+      '@eslint-community/eslint-utils': 4.9.0(eslint@9.39.1(jiti@2.6.1))
       '@eslint-community/regexpp': 4.12.2
       '@eslint/config-array': 0.21.1
       '@eslint/config-helpers': 0.4.2
@@ -17191,7 +18001,7 @@ snapshots:
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.6
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
       escape-string-regexp: 4.0.0
       eslint-scope: 8.4.0
       eslint-visitor-keys: 4.2.1
@@ -17287,7 +18097,7 @@ snapshots:
       openapi3-ts: 3.2.0
       promise-breaker: 6.0.0
       pump: 3.0.0
-      qs: 6.14.0
+      qs: 6.13.0
       raw-body: 2.5.2
       semver: 7.7.4
     transitivePeerDependencies:
@@ -17346,7 +18156,7 @@ snapshots:
       content-type: 1.0.5
       cookie: 0.7.2
       cookie-signature: 1.2.2
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
       depd: 2.0.0
       encodeurl: 2.0.0
       escape-html: 1.0.3
@@ -17422,6 +18232,11 @@ snapshots:
     dependencies:
       path-expression-matcher: 1.2.0
 
+  fast-xml-parser@4.4.1:
+    dependencies:
+      strnum: 1.0.5
+    optional: true
+
   fast-xml-parser@4.5.3:
     dependencies:
       strnum: 1.1.2
@@ -17463,6 +18278,10 @@ snapshots:
     dependencies:
       websocket-driver: 0.7.4
 
+  fdir@6.4.4(picomatch@4.0.3):
+    optionalDependencies:
+      picomatch: 4.0.3
+
   fdir@6.5.0(picomatch@4.0.4):
     optionalDependencies:
       picomatch: 4.0.4
@@ -17493,10 +18312,10 @@ snapshots:
     dependencies:
       app-module-path: 2.2.0
       commander: 12.1.0
-      enhanced-resolve: 5.20.0
+      enhanced-resolve: 5.17.1
       module-definition: 6.0.0
       module-lookup-amd: 9.0.2
-      resolve: 1.22.11
+      resolve: 1.22.10
       resolve-dependency-path: 4.0.0
       sass-lookup: 6.0.1
       stylus-lookup: 6.0.0
@@ -17535,7 +18354,7 @@ snapshots:
 
   finalhandler@2.1.0:
     dependencies:
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
       encodeurl: 2.0.0
       escape-html: 1.0.3
       on-finished: 2.4.1
@@ -17562,7 +18381,7 @@ snapshots:
     dependencies:
       '@fastify/busboy': 1.2.1
       '@firebase/database-compat': 1.0.6
-      '@firebase/database-types': 1.0.16
+      '@firebase/database-types': 1.0.4
       '@types/node': 20.14.11
       jsonwebtoken: 9.0.2
       jwks-rsa: 3.1.0
@@ -17583,7 +18402,7 @@ snapshots:
       ajv: 6.12.6
       archiver: 7.0.1
       async-lock: 1.4.1
-      body-parser: 1.20.3
+      body-parser: 1.20.2
       chokidar: 3.6.0
       cjson: 0.3.3
       cli-table: 0.3.11
@@ -17592,14 +18411,14 @@ snapshots:
       configstore: 5.0.1
       cors: 2.8.5
       cross-env: 5.2.1
-      cross-spawn: 7.0.6
+      cross-spawn: 7.0.3
       csv-parse: 5.5.6
       deep-equal-in-any-order: 2.0.6
       exegesis: 4.2.0
       exegesis-express: 4.0.0
       express: 4.21.2
       filesize: 6.4.0
-      form-data: 4.0.4
+      form-data: 4.0.0
       fs-extra: 10.1.0
       fuzzy: 0.1.3
       gaxios: 6.7.0(encoding@0.1.13)
@@ -17616,7 +18435,7 @@ snapshots:
       mime: 2.6.0
       minimatch: 3.1.2
       morgan: 1.10.0
-      node-fetch: 2.7.0(encoding@0.1.13)
+      node-fetch: 2.6.7(encoding@0.1.13)
       open: 6.4.0
       ora: 5.4.1
       p-limit: 3.1.0
@@ -17626,7 +18445,7 @@ snapshots:
       proxy-agent: 6.4.0
       retry: 0.13.1
       rimraf: 5.0.9
-      semver: 7.7.3
+      semver: 7.6.3
       sql-formatter: 15.3.2
       stream-chain: 2.2.5
       stream-json: 1.8.0
@@ -17634,7 +18453,7 @@ snapshots:
       superstatic: 9.0.3(encoding@0.1.13)
       tar: 6.2.1
       tcp-port-used: 1.0.2
-      tmp: 0.2.5
+      tmp: 0.2.3
       triple-beam: 1.4.1
       universal-analytics: 0.5.3
       update-notifier-cjs: 5.1.6(encoding@0.1.13)
@@ -17702,9 +18521,9 @@ snapshots:
 
   fn.name@1.1.0: {}
 
-  follow-redirects@1.15.6(debug@4.4.3):
+  follow-redirects@1.15.6(debug@4.3.6):
     optionalDependencies:
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.3.6(supports-color@5.5.0)
 
   fontawesome-subset@4.4.0(@fortawesome/fontawesome-free@5.15.4):
     dependencies:
@@ -17737,6 +18556,12 @@ snapshots:
       combined-stream: 1.0.8
       mime-types: 2.1.35
 
+  form-data@4.0.0:
+    dependencies:
+      asynckit: 0.4.0
+      combined-stream: 1.0.8
+      mime-types: 2.1.35
+
   form-data@4.0.4:
     dependencies:
       asynckit: 0.4.0
@@ -17766,7 +18591,7 @@ snapshots:
   fs-extra@10.1.0:
     dependencies:
       graceful-fs: 4.2.11
-      jsonfile: 6.2.0
+      jsonfile: 6.1.0
       universalify: 2.0.1
 
   fs-extra@11.3.2:
@@ -17788,7 +18613,7 @@ snapshots:
 
   fs-minipass@3.0.3:
     dependencies:
-      minipass: 7.1.3
+      minipass: 7.1.2
     optional: true
 
   fs.realpath@1.0.0: {}
@@ -17832,7 +18657,7 @@ snapshots:
   gaxios@6.7.0(encoding@0.1.13):
     dependencies:
       extend: 3.0.2
-      https-proxy-agent: 7.0.6
+      https-proxy-agent: 7.0.5
       is-stream: 2.0.1
       node-fetch: 2.7.0(encoding@0.1.13)
       uuid: 10.0.0
@@ -17903,7 +18728,7 @@ snapshots:
     dependencies:
       basic-ftp: 5.0.5
       data-uri-to-buffer: 6.0.2
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
       fs-extra: 11.3.2
     transitivePeerDependencies:
       - supports-color
@@ -17977,7 +18802,7 @@ snapshots:
       fs.realpath: 1.0.0
       inflight: 1.0.6
       inherits: 2.0.4
-      minimatch: 5.1.9
+      minimatch: 5.1.6
       once: 1.4.0
 
   global-directory@5.0.0:
@@ -18063,7 +18888,7 @@ snapshots:
       abort-controller: 3.0.0
       duplexify: 4.1.3
       google-auth-library: 9.12.0(encoding@0.1.13)
-      node-fetch: 2.7.0(encoding@0.1.13)
+      node-fetch: 2.6.7(encoding@0.1.13)
       object-hash: 3.0.0
       proto3-json-serializer: 2.0.2
       protobufjs: 7.3.2
@@ -18203,7 +19028,7 @@ snapshots:
       entities: 4.5.0
       param-case: 3.0.4
       relateurl: 0.2.7
-      terser: 5.46.0
+      terser: 5.31.3
 
   html-minifier@4.0.0:
     dependencies:
@@ -18257,14 +19082,14 @@ snapshots:
     dependencies:
       '@tootallnate/once': 2.0.0
       agent-base: 6.0.2
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
     transitivePeerDependencies:
       - supports-color
 
   http-proxy-agent@7.0.2:
     dependencies:
-      agent-base: 7.1.4
-      debug: 4.4.3(supports-color@5.5.0)
+      agent-base: 7.1.1
+      debug: 4.4.3
     transitivePeerDependencies:
       - supports-color
 
@@ -18273,14 +19098,21 @@ snapshots:
   https-proxy-agent@5.0.1:
     dependencies:
       agent-base: 6.0.2
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
+    transitivePeerDependencies:
+      - supports-color
+
+  https-proxy-agent@7.0.5:
+    dependencies:
+      agent-base: 7.1.1
+      debug: 4.4.3
     transitivePeerDependencies:
       - supports-color
 
   https-proxy-agent@7.0.6:
     dependencies:
       agent-base: 7.1.4
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
     transitivePeerDependencies:
       - supports-color
 
@@ -18327,7 +19159,7 @@ snapshots:
 
   import-from-esm@1.3.4:
     dependencies:
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
       import-meta-resolve: 4.2.0
     transitivePeerDependencies:
       - supports-color
@@ -18396,7 +19228,7 @@ snapshots:
   ioredis@4.28.5:
     dependencies:
       cluster-key-slot: 1.1.2
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.3.6(supports-color@5.5.0)
       denque: 1.5.1
       lodash.defaults: 4.2.0
       lodash.flatten: 4.4.0
@@ -18413,7 +19245,7 @@ snapshots:
     dependencies:
       '@ioredis/commands': 1.2.0
       cluster-key-slot: 1.1.2
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
       denque: 2.1.0
       lodash.defaults: 4.2.0
       lodash.isarguments: 3.1.0
@@ -18651,7 +19483,7 @@ snapshots:
 
   isomorphic-fetch@3.0.0(encoding@0.1.13):
     dependencies:
-      node-fetch: 2.7.0(encoding@0.1.13)
+      node-fetch: 2.6.7(encoding@0.1.13)
       whatwg-fetch: 3.6.20
     transitivePeerDependencies:
       - encoding
@@ -18723,6 +19555,10 @@ snapshots:
 
   js-tokens@4.0.0: {}
 
+  js-yaml@4.1.0:
+    dependencies:
+      argparse: 2.0.1
+
   js-yaml@4.1.1:
     dependencies:
       argparse: 2.0.1
@@ -18795,6 +19631,12 @@ snapshots:
 
   json5@2.2.3: {}
 
+  jsonfile@6.1.0:
+    dependencies:
+      universalify: 2.0.1
+    optionalDependencies:
+      graceful-fs: 4.2.11
+
   jsonfile@6.2.0:
     dependencies:
       universalify: 2.0.1
@@ -18850,7 +19692,7 @@ snapshots:
     dependencies:
       '@types/express': 4.17.21
       '@types/jsonwebtoken': 9.0.6
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
       jose: 4.15.9
       limiter: 1.1.5
       lru-memoizer: 2.3.0
@@ -18893,15 +19735,15 @@ snapshots:
       fast-glob: 3.3.3
       globby: 13.2.2
       jiti: 1.19.1
-      js-yaml: 4.1.1
+      js-yaml: 4.1.0
       micromatch: 4.0.8
       minimist: 1.2.8
       pretty-ms: 8.0.0
       strip-json-comments: 5.0.3
       summary: 2.1.0
       typescript: 5.9.3
-      zod: 3.23.8
-      zod-validation-error: 1.3.1(zod@3.23.8)
+      zod: 3.25.76
+      zod-validation-error: 1.3.1(zod@3.25.76)
 
   known-css-properties@0.30.0: {}
 
@@ -19044,7 +19886,7 @@ snapshots:
       chalk: 5.2.0
       cli-truncate: 3.1.0
       commander: 10.0.1
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
       execa: 7.2.0
       lilconfig: 2.1.0
       listr2: 5.0.8
@@ -19202,7 +20044,7 @@ snapshots:
       chalk: 4.1.2
       commander: 7.2.0
       commondir: 1.0.1
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.1
       dependency-tree: 11.0.1
       ora: 5.4.1
       pluralize: 8.0.0
@@ -19226,7 +20068,7 @@ snapshots:
 
   magic-string@0.30.17:
     dependencies:
-      '@jridgewell/sourcemap-codec': 1.5.5
+      '@jridgewell/sourcemap-codec': 1.5.0
 
   magic-string@0.30.21:
     dependencies:
@@ -19252,7 +20094,7 @@ snapshots:
       cacache: 18.0.4
       http-cache-semantics: 4.1.1
       is-lambda: 1.0.1
-      minipass: 7.1.3
+      minipass: 7.1.2
       minipass-fetch: 3.0.5
       minipass-flush: 1.0.5
       minipass-pipeline: 1.2.4
@@ -19282,6 +20124,11 @@ snapshots:
 
   marked@4.3.0: {}
 
+  match-sorter@8.3.0:
+    dependencies:
+      '@babel/runtime': 7.29.2
+      remove-accents: 0.5.0
+
   math-intrinsics@1.1.0: {}
 
   mathml-tag-names@4.0.0: {}
@@ -19350,6 +20197,10 @@ snapshots:
     dependencies:
       brace-expansion: 5.0.4
 
+  minimatch@10.2.5:
+    dependencies:
+      brace-expansion: 5.0.5
+
   minimatch@3.1.2:
     dependencies:
       brace-expansion: 1.1.12
@@ -19358,10 +20209,14 @@ snapshots:
     dependencies:
       brace-expansion: 1.1.12
 
-  minimatch@5.1.9:
+  minimatch@5.1.6:
     dependencies:
       brace-expansion: 2.0.2
 
+  minimatch@5.1.9:
+    dependencies:
+      brace-expansion: 2.1.0
+
   minimatch@6.2.3:
     dependencies:
       brace-expansion: 2.0.2
@@ -19378,12 +20233,12 @@ snapshots:
 
   minipass-collect@2.0.1:
     dependencies:
-      minipass: 7.1.3
+      minipass: 7.1.2
     optional: true
 
   minipass-fetch@3.0.5:
     dependencies:
-      minipass: 7.1.3
+      minipass: 7.1.2
       minipass-sized: 1.0.3
       minizlib: 2.1.2
     optionalDependencies:
@@ -19411,6 +20266,8 @@ snapshots:
 
   minipass@5.0.0: {}
 
+  minipass@7.1.2: {}
+
   minipass@7.1.3: {}
 
   minizlib@2.1.2:
@@ -19420,7 +20277,7 @@ snapshots:
 
   mjml-accordion@4.15.0(encoding@0.1.13):
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.28.4
       lodash: 4.17.21
       mjml-core: 4.15.0(encoding@0.1.13)
     transitivePeerDependencies:
@@ -19428,7 +20285,7 @@ snapshots:
 
   mjml-body@4.15.0(encoding@0.1.13):
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.28.4
       lodash: 4.17.21
       mjml-core: 4.15.0(encoding@0.1.13)
     transitivePeerDependencies:
@@ -19436,7 +20293,7 @@ snapshots:
 
   mjml-button@4.15.0(encoding@0.1.13):
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.28.4
       lodash: 4.17.21
       mjml-core: 4.15.0(encoding@0.1.13)
     transitivePeerDependencies:
@@ -19444,7 +20301,7 @@ snapshots:
 
   mjml-carousel@4.15.0(encoding@0.1.13):
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.28.4
       lodash: 4.17.21
       mjml-core: 4.15.0(encoding@0.1.13)
     transitivePeerDependencies:
@@ -19452,7 +20309,7 @@ snapshots:
 
   mjml-cli@4.15.0(encoding@0.1.13):
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.28.4
       chokidar: 3.6.0
       glob: 10.4.5
       html-minifier: 4.0.0
@@ -19468,7 +20325,7 @@ snapshots:
 
   mjml-column@4.15.0(encoding@0.1.13):
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.28.4
       lodash: 4.17.21
       mjml-core: 4.15.0(encoding@0.1.13)
     transitivePeerDependencies:
@@ -19476,7 +20333,7 @@ snapshots:
 
   mjml-core@4.15.0(encoding@0.1.13):
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.28.4
       cheerio: 1.0.0-rc.12
       detect-node: 2.1.0
       html-minifier: 4.0.0
@@ -19491,7 +20348,7 @@ snapshots:
 
   mjml-divider@4.15.0(encoding@0.1.13):
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.28.4
       lodash: 4.17.21
       mjml-core: 4.15.0(encoding@0.1.13)
     transitivePeerDependencies:
@@ -19499,7 +20356,7 @@ snapshots:
 
   mjml-group@4.15.0(encoding@0.1.13):
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.28.4
       lodash: 4.17.21
       mjml-core: 4.15.0(encoding@0.1.13)
     transitivePeerDependencies:
@@ -19507,7 +20364,7 @@ snapshots:
 
   mjml-head-attributes@4.15.0(encoding@0.1.13):
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.28.4
       lodash: 4.17.21
       mjml-core: 4.15.0(encoding@0.1.13)
     transitivePeerDependencies:
@@ -19515,7 +20372,7 @@ snapshots:
 
   mjml-head-breakpoint@4.15.0(encoding@0.1.13):
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.28.4
       lodash: 4.17.21
       mjml-core: 4.15.0(encoding@0.1.13)
     transitivePeerDependencies:
@@ -19523,7 +20380,7 @@ snapshots:
 
   mjml-head-font@4.15.0(encoding@0.1.13):
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.28.4
       lodash: 4.17.21
       mjml-core: 4.15.0(encoding@0.1.13)
     transitivePeerDependencies:
@@ -19531,7 +20388,7 @@ snapshots:
 
   mjml-head-html-attributes@4.15.0(encoding@0.1.13):
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.28.4
       lodash: 4.17.21
       mjml-core: 4.15.0(encoding@0.1.13)
     transitivePeerDependencies:
@@ -19539,7 +20396,7 @@ snapshots:
 
   mjml-head-preview@4.15.0(encoding@0.1.13):
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.28.4
       lodash: 4.17.21
       mjml-core: 4.15.0(encoding@0.1.13)
     transitivePeerDependencies:
@@ -19547,7 +20404,7 @@ snapshots:
 
   mjml-head-style@4.15.0(encoding@0.1.13):
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.28.4
       lodash: 4.17.21
       mjml-core: 4.15.0(encoding@0.1.13)
     transitivePeerDependencies:
@@ -19555,7 +20412,7 @@ snapshots:
 
   mjml-head-title@4.15.0(encoding@0.1.13):
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.28.4
       lodash: 4.17.21
       mjml-core: 4.15.0(encoding@0.1.13)
     transitivePeerDependencies:
@@ -19563,7 +20420,7 @@ snapshots:
 
   mjml-head@4.15.0(encoding@0.1.13):
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.28.4
       lodash: 4.17.21
       mjml-core: 4.15.0(encoding@0.1.13)
     transitivePeerDependencies:
@@ -19571,7 +20428,7 @@ snapshots:
 
   mjml-hero@4.15.0(encoding@0.1.13):
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.28.4
       lodash: 4.17.21
       mjml-core: 4.15.0(encoding@0.1.13)
     transitivePeerDependencies:
@@ -19579,7 +20436,7 @@ snapshots:
 
   mjml-image@4.15.0(encoding@0.1.13):
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.28.4
       lodash: 4.17.21
       mjml-core: 4.15.0(encoding@0.1.13)
     transitivePeerDependencies:
@@ -19587,7 +20444,7 @@ snapshots:
 
   mjml-migrate@4.15.0(encoding@0.1.13):
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.28.4
       js-beautify: 1.15.1
       lodash: 4.17.21
       mjml-core: 4.15.0(encoding@0.1.13)
@@ -19598,7 +20455,7 @@ snapshots:
 
   mjml-navbar@4.15.0(encoding@0.1.13):
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.28.4
       lodash: 4.17.21
       mjml-core: 4.15.0(encoding@0.1.13)
     transitivePeerDependencies:
@@ -19606,14 +20463,14 @@ snapshots:
 
   mjml-parser-xml@4.15.0:
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.28.4
       detect-node: 2.1.0
       htmlparser2: 9.1.0
       lodash: 4.17.21
 
   mjml-preset-core@4.15.0(encoding@0.1.13):
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.28.4
       mjml-accordion: 4.15.0(encoding@0.1.13)
       mjml-body: 4.15.0(encoding@0.1.13)
       mjml-button: 4.15.0(encoding@0.1.13)
@@ -19644,7 +20501,7 @@ snapshots:
 
   mjml-raw@4.15.0(encoding@0.1.13):
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.28.4
       lodash: 4.17.21
       mjml-core: 4.15.0(encoding@0.1.13)
     transitivePeerDependencies:
@@ -19652,7 +20509,7 @@ snapshots:
 
   mjml-section@4.15.0(encoding@0.1.13):
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.28.4
       lodash: 4.17.21
       mjml-core: 4.15.0(encoding@0.1.13)
     transitivePeerDependencies:
@@ -19660,7 +20517,7 @@ snapshots:
 
   mjml-social@4.15.0(encoding@0.1.13):
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.28.4
       lodash: 4.17.21
       mjml-core: 4.15.0(encoding@0.1.13)
     transitivePeerDependencies:
@@ -19668,7 +20525,7 @@ snapshots:
 
   mjml-spacer@4.15.0(encoding@0.1.13):
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.28.4
       lodash: 4.17.21
       mjml-core: 4.15.0(encoding@0.1.13)
     transitivePeerDependencies:
@@ -19676,7 +20533,7 @@ snapshots:
 
   mjml-table@4.15.0(encoding@0.1.13):
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.28.4
       lodash: 4.17.21
       mjml-core: 4.15.0(encoding@0.1.13)
     transitivePeerDependencies:
@@ -19684,7 +20541,7 @@ snapshots:
 
   mjml-text@4.15.0(encoding@0.1.13):
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.28.4
       lodash: 4.17.21
       mjml-core: 4.15.0(encoding@0.1.13)
     transitivePeerDependencies:
@@ -19692,11 +20549,11 @@ snapshots:
 
   mjml-validator@4.13.0:
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.28.4
 
   mjml-wrapper@4.15.0(encoding@0.1.13):
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.28.4
       lodash: 4.17.21
       mjml-core: 4.15.0(encoding@0.1.13)
       mjml-section: 4.15.0(encoding@0.1.13)
@@ -19705,7 +20562,7 @@ snapshots:
 
   mjml@4.15.0(encoding@0.1.13):
     dependencies:
-      '@babel/runtime': 7.28.6
+      '@babel/runtime': 7.25.0
       mjml-cli: 4.15.0(encoding@0.1.13)
       mjml-core: 4.15.0(encoding@0.1.13)
       mjml-migrate: 4.15.0(encoding@0.1.13)
@@ -19869,6 +20726,12 @@ snapshots:
     dependencies:
       http2-client: 1.3.5
 
+  node-fetch@2.6.7(encoding@0.1.13):
+    dependencies:
+      whatwg-url: 5.0.0
+    optionalDependencies:
+      encoding: 0.1.13
+
   node-fetch@2.7.0(encoding@0.1.13):
     dependencies:
       whatwg-url: 5.0.0
@@ -19913,7 +20776,7 @@ snapshots:
   nodemon@3.1.14:
     dependencies:
       chokidar: 3.6.0
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.3.6(supports-color@5.5.0)
       ignore-by-default: 1.0.1
       minimatch: 10.2.4
       pstree.remy: 1.1.8
@@ -20189,11 +21052,11 @@ snapshots:
   pac-proxy-agent@7.0.2:
     dependencies:
       '@tootallnate/quickjs-emscripten': 0.23.0
-      agent-base: 7.1.4
-      debug: 4.4.3(supports-color@5.5.0)
+      agent-base: 7.1.1
+      debug: 4.4.3
       get-uri: 6.0.3
       http-proxy-agent: 7.0.2
-      https-proxy-agent: 7.0.6
+      https-proxy-agent: 7.0.5
       pac-resolver: 7.0.1
       socks-proxy-agent: 8.0.4
     transitivePeerDependencies:
@@ -20223,14 +21086,14 @@ snapshots:
 
   parse-json@5.2.0:
     dependencies:
-      '@babel/code-frame': 7.28.6
+      '@babel/code-frame': 7.27.1
       error-ex: 1.3.4
       json-parse-even-better-errors: 2.3.1
       lines-and-columns: 1.2.4
 
   parse-json@8.3.0:
     dependencies:
-      '@babel/code-frame': 7.28.6
+      '@babel/code-frame': 7.27.1
       index-to-position: 1.2.0
       type-fest: 4.41.0
 
@@ -20285,7 +21148,7 @@ snapshots:
   path-scurry@1.11.1:
     dependencies:
       lru-cache: 10.4.3
-      minipass: 7.1.3
+      minipass: 7.1.2
 
   path-scurry@2.0.2:
     dependencies:
@@ -20566,10 +21429,10 @@ snapshots:
 
   proxy-agent@6.4.0:
     dependencies:
-      agent-base: 7.1.4
-      debug: 4.4.3(supports-color@5.5.0)
+      agent-base: 7.1.1
+      debug: 4.4.3
       http-proxy-agent: 7.0.2
-      https-proxy-agent: 7.0.6
+      https-proxy-agent: 7.0.5
       lru-cache: 7.18.3
       pac-proxy-agent: 7.0.2
       proxy-from-env: 1.1.0
@@ -20598,6 +21461,14 @@ snapshots:
     dependencies:
       hookified: 2.1.1
 
+  qs@6.11.0:
+    dependencies:
+      side-channel: 1.1.0
+
+  qs@6.12.3:
+    dependencies:
+      side-channel: 1.0.6
+
   qs@6.13.0:
     dependencies:
       side-channel: 1.1.0
@@ -20726,7 +21597,7 @@ snapshots:
 
   readdir-glob@1.1.3:
     dependencies:
-      minimatch: 5.1.9
+      minimatch: 5.1.6
 
   readdirp@3.6.0:
     dependencies:
@@ -20809,6 +21680,8 @@ snapshots:
 
   regenerate@1.4.2: {}
 
+  regenerator-runtime@0.14.1: {}
+
   regexp.prototype.flags@1.5.4:
     dependencies:
       call-bind: 1.0.9
@@ -20843,6 +21716,8 @@ snapshots:
 
   relateurl@0.2.7: {}
 
+  remove-accents@0.5.0: {}
+
   require-directory@2.1.1: {}
 
   require-from-string@2.0.2: {}
@@ -20862,7 +21737,7 @@ snapshots:
 
   resolve-pkg-maps@1.0.0: {}
 
-  resolve@1.22.11:
+  resolve@1.22.10:
     dependencies:
       is-core-module: 2.16.1
       path-parse: 1.0.7
@@ -20948,32 +21823,30 @@ snapshots:
     optionalDependencies:
       fsevents: 2.3.3
 
-  rollup@4.52.5:
+  rollup@4.40.0:
     dependencies:
-      '@types/estree': 1.0.8
+      '@types/estree': 1.0.7
     optionalDependencies:
-      '@rollup/rollup-android-arm-eabi': 4.52.5
-      '@rollup/rollup-android-arm64': 4.52.5
-      '@rollup/rollup-darwin-arm64': 4.52.5
-      '@rollup/rollup-darwin-x64': 4.52.5
-      '@rollup/rollup-freebsd-arm64': 4.52.5
-      '@rollup/rollup-freebsd-x64': 4.52.5
-      '@rollup/rollup-linux-arm-gnueabihf': 4.52.5
-      '@rollup/rollup-linux-arm-musleabihf': 4.52.5
-      '@rollup/rollup-linux-arm64-gnu': 4.52.5
-      '@rollup/rollup-linux-arm64-musl': 4.52.5
-      '@rollup/rollup-linux-loong64-gnu': 4.52.5
-      '@rollup/rollup-linux-ppc64-gnu': 4.52.5
-      '@rollup/rollup-linux-riscv64-gnu': 4.52.5
-      '@rollup/rollup-linux-riscv64-musl': 4.52.5
-      '@rollup/rollup-linux-s390x-gnu': 4.52.5
-      '@rollup/rollup-linux-x64-gnu': 4.52.5
-      '@rollup/rollup-linux-x64-musl': 4.52.5
-      '@rollup/rollup-openharmony-arm64': 4.52.5
-      '@rollup/rollup-win32-arm64-msvc': 4.52.5
-      '@rollup/rollup-win32-ia32-msvc': 4.52.5
-      '@rollup/rollup-win32-x64-gnu': 4.52.5
-      '@rollup/rollup-win32-x64-msvc': 4.52.5
+      '@rollup/rollup-android-arm-eabi': 4.40.0
+      '@rollup/rollup-android-arm64': 4.40.0
+      '@rollup/rollup-darwin-arm64': 4.40.0
+      '@rollup/rollup-darwin-x64': 4.40.0
+      '@rollup/rollup-freebsd-arm64': 4.40.0
+      '@rollup/rollup-freebsd-x64': 4.40.0
+      '@rollup/rollup-linux-arm-gnueabihf': 4.40.0
+      '@rollup/rollup-linux-arm-musleabihf': 4.40.0
+      '@rollup/rollup-linux-arm64-gnu': 4.40.0
+      '@rollup/rollup-linux-arm64-musl': 4.40.0
+      '@rollup/rollup-linux-loongarch64-gnu': 4.40.0
+      '@rollup/rollup-linux-powerpc64le-gnu': 4.40.0
+      '@rollup/rollup-linux-riscv64-gnu': 4.40.0
+      '@rollup/rollup-linux-riscv64-musl': 4.40.0
+      '@rollup/rollup-linux-s390x-gnu': 4.40.0
+      '@rollup/rollup-linux-x64-gnu': 4.40.0
+      '@rollup/rollup-linux-x64-musl': 4.40.0
+      '@rollup/rollup-win32-arm64-msvc': 4.40.0
+      '@rollup/rollup-win32-ia32-msvc': 4.40.0
+      '@rollup/rollup-win32-x64-msvc': 4.40.0
       fsevents: 2.3.3
 
   rollup@4.60.1:
@@ -21021,7 +21894,7 @@ snapshots:
 
   router@2.2.0:
     dependencies:
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
       depd: 2.0.0
       is-promise: 4.0.0
       parseurl: 1.3.3
@@ -21111,6 +21984,8 @@ snapshots:
 
   semver@6.3.1: {}
 
+  semver@7.6.3: {}
+
   semver@7.7.3: {}
 
   semver@7.7.4: {}
@@ -21153,7 +22028,7 @@ snapshots:
 
   send@1.2.0:
     dependencies:
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
       encodeurl: 2.0.0
       escape-html: 1.0.3
       etag: 1.8.1
@@ -21179,10 +22054,16 @@ snapshots:
     dependencies:
       seroval: 1.5.0
 
+  seroval-plugins@1.5.2(seroval@1.5.2):
+    dependencies:
+      seroval: 1.5.2
+
   seroval@1.3.2: {}
 
   seroval@1.5.0: {}
 
+  seroval@1.5.2: {}
+
   serve-static@1.16.2:
     dependencies:
       encodeurl: 2.0.0
@@ -21293,6 +22174,13 @@ snapshots:
       object-inspect: 1.13.4
       side-channel-map: 1.0.1
 
+  side-channel@1.0.6:
+    dependencies:
+      call-bind: 1.0.7
+      es-errors: 1.3.0
+      get-intrinsic: 1.3.0
+      object-inspect: 1.13.4
+
   side-channel@1.1.0:
     dependencies:
       es-errors: 1.3.0
@@ -21311,7 +22199,7 @@ snapshots:
     dependencies:
       '@kwsites/file-exists': 1.1.1
       '@kwsites/promise-deferred': 1.1.1
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
     transitivePeerDependencies:
       - supports-color
 
@@ -21325,7 +22213,7 @@ snapshots:
 
   simple-websocket@9.1.0:
     dependencies:
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
       queue-microtask: 1.2.3
       randombytes: 2.1.0
       readable-stream: 3.6.2
@@ -21380,8 +22268,8 @@ snapshots:
 
   socks-proxy-agent@8.0.4:
     dependencies:
-      agent-base: 7.1.4
-      debug: 4.4.3(supports-color@5.5.0)
+      agent-base: 7.1.1
+      debug: 4.4.3
       socks: 2.8.3
     transitivePeerDependencies:
       - supports-color
@@ -21416,20 +22304,26 @@ snapshots:
       seroval: 1.5.0
       seroval-plugins: 1.5.0(seroval@1.5.0)
 
+  solid-js@1.9.12:
+    dependencies:
+      csstype: 3.2.3
+      seroval: 1.5.2
+      seroval-plugins: 1.5.2(seroval@1.5.2)
+
   solid-refresh@0.6.3(solid-js@1.9.10):
     dependencies:
-      '@babel/generator': 7.28.6
-      '@babel/helper-module-imports': 7.28.6
-      '@babel/types': 7.28.6
+      '@babel/generator': 7.28.5
+      '@babel/helper-module-imports': 7.27.1
+      '@babel/types': 7.28.5
       solid-js: 1.9.10
     transitivePeerDependencies:
       - supports-color
 
   solid-refresh@0.6.3(solid-js@1.9.11):
     dependencies:
-      '@babel/generator': 7.28.6
-      '@babel/helper-module-imports': 7.28.6
-      '@babel/types': 7.28.6
+      '@babel/generator': 7.28.5
+      '@babel/helper-module-imports': 7.27.1
+      '@babel/types': 7.28.5
       solid-js: 1.9.11
     transitivePeerDependencies:
       - supports-color
@@ -21509,7 +22403,7 @@ snapshots:
 
   ssri@10.0.6:
     dependencies:
-      minipass: 7.1.3
+      minipass: 7.1.2
     optional: true
 
   stack-trace@0.0.10: {}
@@ -21563,7 +22457,7 @@ snapshots:
       '@testing-library/user-event': 14.6.1(@testing-library/dom@10.4.1)
       '@vitest/expect': 3.2.4
       '@vitest/spy': 3.2.4
-      esbuild: 0.27.3
+      esbuild: 0.25.11
       open: 10.2.0
       recast: 0.23.11
       semver: 7.7.3
@@ -21681,6 +22575,10 @@ snapshots:
     dependencies:
       ansi-regex: 5.0.1
 
+  strip-ansi@7.1.0:
+    dependencies:
+      ansi-regex: 6.2.2
+
   strip-ansi@7.1.2:
     dependencies:
       ansi-regex: 6.2.2
@@ -21701,6 +22599,9 @@ snapshots:
 
   strip-json-comments@5.0.3: {}
 
+  strnum@1.0.5:
+    optional: true
+
   strnum@1.1.2: {}
 
   strnum@2.2.2: {}
@@ -21777,7 +22678,7 @@ snapshots:
       cosmiconfig: 9.0.1(typescript@6.0.2)
       css-functions-list: 3.3.3
       css-tree: 3.2.1
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
       fast-glob: 3.3.3
       fastest-levenshtein: 1.0.16
       file-entry-cache: 11.1.2
@@ -21835,7 +22736,7 @@ snapshots:
     dependencies:
       component-emitter: 1.3.1
       cookiejar: 2.1.4
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
       fast-safe-stringify: 2.1.1
       form-data: 4.0.4
       formidable: 3.5.4
@@ -21908,14 +22809,14 @@ snapshots:
 
   swagger-stats@0.99.7(prom-client@15.1.3):
     dependencies:
-      axios: 1.7.4(debug@4.4.3)
+      axios: 1.7.4(debug@4.3.6)
       basic-auth: 2.0.1
       cookies: 0.8.0
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.3.6(supports-color@5.5.0)
       moment: 2.30.1
       path-to-regexp: 6.2.2
       prom-client: 15.1.3
-      qs: 6.14.0
+      qs: 6.12.3
       send: 0.18.0
       uuid: 9.0.1
     transitivePeerDependencies:
@@ -21953,6 +22854,8 @@ snapshots:
 
   tailwindcss@4.2.1: {}
 
+  tapable@2.2.1: {}
+
   tapable@2.3.0: {}
 
   tar-fs@2.1.4:
@@ -22026,10 +22929,10 @@ snapshots:
       type-fest: 0.16.0
       unique-string: 2.0.0
 
-  terser@5.46.0:
+  terser@5.31.3:
     dependencies:
-      '@jridgewell/source-map': 0.3.11
-      acorn: 8.15.0
+      '@jridgewell/source-map': 0.3.6
+      acorn: 8.14.0
       commander: 2.20.3
       source-map-support: 0.5.21
 
@@ -22047,7 +22950,7 @@ snapshots:
       archiver: 7.0.1
       async-lock: 1.4.1
       byline: 5.0.0
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
       docker-compose: 1.3.0
       dockerode: 4.0.9
       get-port: 7.1.0
@@ -22093,11 +22996,21 @@ snapshots:
 
   tinyexec@1.1.2: {}
 
+  tinyglobby@0.2.13:
+    dependencies:
+      fdir: 6.4.4(picomatch@4.0.3)
+      picomatch: 4.0.3
+
   tinyglobby@0.2.15:
     dependencies:
       fdir: 6.5.0(picomatch@4.0.4)
       picomatch: 4.0.4
 
+  tinyglobby@0.2.16:
+    dependencies:
+      fdir: 6.5.0(picomatch@4.0.4)
+      picomatch: 4.0.4
+
   tinypool@2.1.0: {}
 
   tinyrainbow@2.0.0: {}
@@ -22118,6 +23031,8 @@ snapshots:
     dependencies:
       os-tmpdir: 1.0.2
 
+  tmp@0.2.3: {}
+
   tmp@0.2.5: {}
 
   to-no-case@1.0.2: {}
@@ -22176,6 +23091,10 @@ snapshots:
     dependencies:
       typescript: 6.0.2
 
+  ts-api-utils@2.5.0(typescript@6.0.2):
+    dependencies:
+      typescript: 6.0.2
+
   ts-dedent@2.2.0: {}
 
   ts-deepmerge@6.2.1: {}
@@ -22195,27 +23114,29 @@ snapshots:
       minimist: 1.2.8
       strip-bom: 3.0.0
 
+  tslib@2.6.3: {}
+
   tslib@2.8.1: {}
 
   tsscmp@1.0.6: {}
 
   tsup@8.4.0(jiti@2.6.1)(postcss@8.5.8)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3):
     dependencies:
-      bundle-require: 5.1.0(esbuild@0.25.11)
+      bundle-require: 5.1.0(esbuild@0.25.0)
       cac: 6.7.14
       chokidar: 4.0.3
       consola: 3.4.0
-      debug: 4.4.3(supports-color@5.5.0)
-      esbuild: 0.25.11
+      debug: 4.4.1
+      esbuild: 0.25.0
       joycon: 3.1.1
       picocolors: 1.1.1
       postcss-load-config: 6.0.1(jiti@2.6.1)(postcss@8.5.8)(tsx@4.21.0)(yaml@2.8.3)
       resolve-from: 5.0.0
-      rollup: 4.52.5
+      rollup: 4.40.0
       source-map: 0.8.0-beta.0
       sucrase: 3.35.0
       tinyexec: 0.3.2
-      tinyglobby: 0.2.15
+      tinyglobby: 0.2.13
       tree-kill: 1.2.2
     optionalDependencies:
       postcss: 8.5.8
@@ -22386,7 +23307,7 @@ snapshots:
 
   universal-analytics@0.5.3:
     dependencies:
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
       uuid: 8.3.2
     transitivePeerDependencies:
       - supports-color
@@ -22410,7 +23331,7 @@ snapshots:
 
   unplugin@1.16.1:
     dependencies:
-      acorn: 8.15.0
+      acorn: 8.14.0
       webpack-virtual-modules: 0.6.2
 
   unplugin@2.3.11:
@@ -22422,6 +23343,12 @@ snapshots:
 
   upath@1.2.0: {}
 
+  update-browserslist-db@1.2.3(browserslist@4.28.0):
+    dependencies:
+      browserslist: 4.28.0
+      escalade: 3.2.0
+      picocolors: 1.1.1
+
   update-browserslist-db@1.2.3(browserslist@4.28.1):
     dependencies:
       browserslist: 4.28.1
@@ -22512,7 +23439,7 @@ snapshots:
   vite-plugin-inspect@11.3.3(vite@8.0.5(@emnapi/core@1.9.0)(@emnapi/runtime@1.9.0)(@types/node@24.9.1)(esbuild@0.27.7)(jiti@2.6.1)(sass@1.70.0)(terser@5.46.2)(tsx@4.21.0)(yaml@2.8.3)):
     dependencies:
       ansis: 4.2.0
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
       error-stack-parser-es: 1.0.5
       ohash: 2.0.11
       open: 10.2.0
@@ -22532,7 +23459,7 @@ snapshots:
 
   vite-plugin-pwa@1.1.0(vite@8.0.5(@emnapi/core@1.9.0)(@emnapi/runtime@1.9.0)(@types/node@24.9.1)(esbuild@0.27.7)(jiti@2.6.1)(sass@1.70.0)(terser@5.46.2)(tsx@4.21.0)(yaml@2.8.3))(workbox-build@7.1.1(@types/babel__core@7.20.5))(workbox-window@7.1.0):
     dependencies:
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3
       pretty-bytes: 6.1.1
       tinyglobby: 0.2.15
       vite: 8.0.5(@emnapi/core@1.9.0)(@emnapi/runtime@1.9.0)(@types/node@24.9.1)(esbuild@0.27.7)(jiti@2.6.1)(sass@1.70.0)(terser@5.46.2)(tsx@4.21.0)(yaml@2.8.3)
@@ -22543,9 +23470,9 @@ snapshots:
 
   vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.11)(vite@7.3.2(@types/node@24.9.1)(jiti@2.6.1)(lightningcss@1.32.0)(sass@1.98.0)(terser@5.46.2)(tsx@4.21.0)(yaml@2.8.3)):
     dependencies:
-      '@babel/core': 7.28.6
+      '@babel/core': 7.28.5
       '@types/babel__core': 7.20.5
-      babel-preset-solid: 1.9.10(@babel/core@7.28.6)(solid-js@1.9.11)
+      babel-preset-solid: 1.9.10(@babel/core@7.28.5)(solid-js@1.9.11)
       merge-anything: 5.1.7
       solid-js: 1.9.11
       solid-refresh: 0.6.3(solid-js@1.9.11)
@@ -22589,7 +23516,7 @@ snapshots:
       tsx: 4.21.0
       yaml: 2.8.3
 
-  vite@8.0.5(@emnapi/core@1.9.0)(@emnapi/runtime@1.9.0)(@types/node@24.9.1)(esbuild@0.25.11)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.2)(tsx@4.21.0)(yaml@2.8.3):
+  vite@8.0.5(@emnapi/core@1.9.0)(@emnapi/runtime@1.9.0)(@types/node@24.9.1)(esbuild@0.25.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.2)(tsx@4.21.0)(yaml@2.8.3):
     dependencies:
       lightningcss: 1.32.0
       picomatch: 4.0.4
@@ -22598,7 +23525,7 @@ snapshots:
       tinyglobby: 0.2.15
     optionalDependencies:
       '@types/node': 24.9.1
-      esbuild: 0.25.11
+      esbuild: 0.25.0
       fsevents: 2.3.3
       jiti: 2.6.1
       sass: 1.98.0
@@ -22737,10 +23664,10 @@ snapshots:
     transitivePeerDependencies:
       - msw
 
-  vitest@4.1.0(@types/node@24.9.1)(happy-dom@20.8.9)(jsdom@27.4.0)(vite@8.0.5(@emnapi/core@1.9.0)(@emnapi/runtime@1.9.0)(@types/node@24.9.1)(esbuild@0.25.11)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.2)(tsx@4.21.0)(yaml@2.8.3)):
+  vitest@4.1.0(@types/node@24.9.1)(happy-dom@20.8.9)(jsdom@27.4.0)(vite@8.0.5(@emnapi/core@1.9.0)(@emnapi/runtime@1.9.0)(@types/node@24.9.1)(esbuild@0.25.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.2)(tsx@4.21.0)(yaml@2.8.3)):
     dependencies:
       '@vitest/expect': 4.1.0
-      '@vitest/mocker': 4.1.0(vite@8.0.5(@emnapi/core@1.9.0)(@emnapi/runtime@1.9.0)(@types/node@24.9.1)(esbuild@0.25.11)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.2)(tsx@4.21.0)(yaml@2.8.3))
+      '@vitest/mocker': 4.1.0(vite@8.0.5(@emnapi/core@1.9.0)(@emnapi/runtime@1.9.0)(@types/node@24.9.1)(esbuild@0.25.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.2)(tsx@4.21.0)(yaml@2.8.3))
       '@vitest/pretty-format': 4.1.0
       '@vitest/runner': 4.1.0
       '@vitest/snapshot': 4.1.0
@@ -22757,7 +23684,7 @@ snapshots:
       tinyexec: 1.0.2
       tinyglobby: 0.2.15
       tinyrainbow: 3.0.3
-      vite: 8.0.5(@emnapi/core@1.9.0)(@emnapi/runtime@1.9.0)(@types/node@24.9.1)(esbuild@0.25.11)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.2)(tsx@4.21.0)(yaml@2.8.3)
+      vite: 8.0.5(@emnapi/core@1.9.0)(@emnapi/runtime@1.9.0)(@types/node@24.9.1)(esbuild@0.25.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.2)(tsx@4.21.0)(yaml@2.8.3)
       why-is-node-running: 2.3.0
     optionalDependencies:
       '@types/node': 24.9.1
@@ -22978,7 +23905,7 @@ snapshots:
   winston@3.6.0:
     dependencies:
       '@dabh/diagnostics': 2.0.3
-      async: 3.2.6
+      async: 3.2.5
       is-stream: 2.0.1
       logform: 2.6.1
       one-time: 1.0.0
@@ -23144,6 +24071,8 @@ snapshots:
 
   ws@8.19.0: {}
 
+  ws@8.20.0: {}
+
   wsl-utils@0.1.0:
     dependencies:
       is-wsl: 3.1.0
@@ -23216,8 +24145,10 @@ snapshots:
     dependencies:
       zod: 3.23.8
 
-  zod-validation-error@1.3.1(zod@3.23.8):
+  zod-validation-error@1.3.1(zod@3.25.76):
     dependencies:
-      zod: 3.23.8
+      zod: 3.25.76
 
   zod@3.23.8: {}
+
+  zod@3.25.76: {}

From 64036f943b33545b1f075a22eaac5e174202277c Mon Sep 17 00:00:00 2001
From: Miodec <jack@monkeytype.com>
Date: Tue, 5 May 2026 09:29:25 +0200
Subject: [PATCH 2/5] chore: release v26.19.0

---
 frontend/static/contributors.json | 103 ++++++++++++++++--------------
 package.json                      |   2 +-
 2 files changed, 57 insertions(+), 48 deletions(-)

diff --git a/frontend/static/contributors.json b/frontend/static/contributors.json
index dde685fa4dd4..d70522b66769 100644
--- a/frontend/static/contributors.json
+++ b/frontend/static/contributors.json
@@ -5,8 +5,8 @@
   "Leonabcd123",
   "lukew3",
   "byseif21",
-  "typerqeo",
   "nadalaba",
+  "typerqeo",
   "Ferotiq",
   "rizwanmustafa",
   "bhomie",
@@ -185,8 +185,8 @@
   "MichaelDeutschCoding",
   "prince-patel23",
   "shahnewaz-labib",
-  "MoushufAlam",
   "MushyToast",
+  "MoushufAlam",
   "Triikk",
   "nocommentcode",
   "MakerJake01",
@@ -200,7 +200,6 @@
   "janreggie",
   "JNX03",
   "Inirdin",
-  "ShizukoV",
   "Shashwat-pd",
   "shanedonovan",
   "scarcekoi",
@@ -209,7 +208,9 @@
   "SarkarKurdish",
   "Samunals",
   "SameerJS6",
-  "mehdihdev",
+  "Ryrden",
+  "BalkoBalkho",
+  "ShizukoV",
   "sohamb117",
   "Soufi-ane",
   "stevep99",
@@ -220,7 +221,7 @@
   "TheFrenchTechMan",
   "tjkuson",
   "Typeacode",
-  "jirmu",
+  "mehdihdev",
   "mendelmaleh",
   "michelkoga",
   "mohanadft",
@@ -243,7 +244,7 @@
   "rdavison",
   "Rodrigo Chireia",
   "ryan-harrington",
-  "Ryrden",
+  "jirmu",
   "joshuamango",
   "kStor2poche",
   "kopipahit-1",
@@ -310,10 +311,10 @@
   "dCubelic",
   "dunk2k",
   "ehanahamed",
-  "MapManagement",
   "266-750Balloons",
   "5quiwyrm",
   "minerscale",
+  "ennajari",
   "almk-dev",
   "Abinawan",
   "aditya1rawat",
@@ -333,7 +334,7 @@
   "DarthJarJarJar",
   "akmatoff",
   "bala418",
-  "BalkoBalkho",
+  "MapManagement",
   "Jashmeen",
   "Jeff0502",
   "jeffersonjpr",
@@ -379,9 +380,6 @@
   "GalileoBlues",
   "gforien",
   "thesomewhatyou",
-  "Tekkermester",
-  "Technet",
-  "Taryn Hill",
   "Tarun",
   "Tarik Kaya",
   "Tanish",
@@ -391,7 +389,13 @@
   "Stiaan Nel",
   "Steve H",
   "Spurk",
-  "Santi Santichaivekin",
+  "Souren Papazian",
+  "Sokrates",
+  "Sohro",
+  "Samyak Bardiya",
+  "Taryn Hill",
+  "Technet",
+  "Tekkermester",
   "Temmie",
   "Terminal",
   "TheKaushikGoswami",
@@ -401,9 +405,8 @@
   "Thor",
   "Tim Boex",
   "Tim Martin",
-  "Timothy Gibbons",
-  "Timothy Moores",
-  "Tiyen",
+  "Sanchir Enkhbold",
+  "Santi Santichaivekin",
   "Saptarshi Ghosh",
   "Sarmad Hadi",
   "SauceyRed",
@@ -413,6 +416,7 @@
   "Sergi Meseguer",
   "Shakhzod Bobolov",
   "ShaneBerhoff",
+  "Sharann Manojkumar",
   "Shawn M Moore",
   "Sheumais",
   "Shriram Khandbahale",
@@ -424,9 +428,9 @@
   "Sisisit",
   "Snyk bot",
   "Sohail Akthar",
-  "Sohro",
-  "Sokrates",
-  "Souren Papazian",
+  "Timothy Gibbons",
+  "Viktor",
+  "Vinayak",
   "Vincent LE GOFF",
   "Vishal",
   "Vishal Narayan V",
@@ -450,8 +454,8 @@
   "Zach Brehm",
   "Zach Stence",
   "Zach Tepper",
-  "Zanin Andrea",
-  "Zarrten",
+  "Timothy Moores",
+  "Tiyen",
   "Tobi",
   "Tobias Kendlbacher",
   "Tobin Richard",
@@ -474,8 +478,9 @@
   "Victor Garcia",
   "Victor Kochkarev",
   "Vignesh",
-  "Viktor",
-  "Vinayak",
+  "Nikolai Ogorodnik",
+  "PTLux1517",
+  "Pablo Sánchez Flores",
   "Paras Arya",
   "Paul Ebose",
   "Paul H Choi",
@@ -499,8 +504,7 @@
   "Pratham Purohit",
   "Pratham Tandale",
   "ProBottler",
-  "Provola23",
-  "Punit Bhesota",
+  "Nis-chal-Jain",
   "Nivaldinho-jpg",
   "Noah",
   "Noah K",
@@ -521,11 +525,11 @@
   "Oscar Lee-Vermeren",
   "Oskar283",
   "Osmiuth",
+  "Oussama",
   "Outdated",
   "Owen Jones",
   "PS-PARSA",
-  "PTLux1517",
-  "Pablo Sánchez Flores",
+  "Rohit Kumar Saini",
   "Roj",
   "Ronnapat Srivoravilai",
   "Ronnapatp",
@@ -549,8 +553,8 @@
   "Sameer M",
   "Samuel Breznjak",
   "Samuel Hautamäki",
-  "Samyak Bardiya",
-  "Sanchir Enkhbold",
+  "Provola23",
+  "Punit Bhesota",
   "Qihan Liu",
   "QuevDev",
   "Quiggleson",
@@ -573,7 +577,7 @@
   "Rishav Raj",
   "Robert Clover",
   "Rodolfo Velázquez",
-  "Rohit Kumar Saini",
+  "kjvlbu",
   "myakinx",
   "neinja",
   "net-tech-",
@@ -672,6 +676,8 @@
   "tuzu128",
   "typermonkeyuser",
   "uShldGetCeleste",
+  "Zanin Andrea",
+  "ashharrrrr",
   "ba1man",
   "ballerboo",
   "bapic",
@@ -696,7 +702,7 @@
   "connermcnicholas",
   "cute-catgirl",
   "dankuri",
-  "dasle52",
+  "Zarrten",
   "Zeal Patel",
   "Zephyr Jones",
   "Zev Ross",
@@ -720,7 +726,7 @@
   "aoi-buh",
   "aoieop",
   "arthur",
-  "ashharrrrr",
+  "gwenzek",
   "hakujitsu",
   "hikettei",
   "hossammenem",
@@ -745,7 +751,7 @@
   "kelvine",
   "kenn",
   "kikuKeii",
-  "kjvlbu",
+  "dasle52",
   "david",
   "davidjnovak",
   "diogozarro",
@@ -768,8 +774,7 @@
   "git push origin P",
   "gkaply532",
   "grigoriynikolaev",
-  "gwenzek",
-  "Connor",
+  "Bianco Da Costa Oliveira",
   "Connor Goldberg",
   "CoolenL",
   "Cory Shaw",
@@ -792,8 +797,8 @@
   "Danish arora",
   "DannyKoz123",
   "Darryl Brooks",
+  "Darshan Paccha",
   "DastardlySky",
-  "Bianco Da Costa Oliveira",
   "Binekrasik",
   "Biplav Barua",
   "Boris Gubanov",
@@ -818,6 +823,8 @@
   "Clément Martinez",
   "Colby Chai",
   "Colin H",
+  "Connor",
+  "Eduardo Paul",
   "Edward Huang",
   "Eggflaw",
   "ElAmogusSus",
@@ -841,7 +848,6 @@
   "Francis A",
   "Francis Eugene Casibu",
   "Frederick (Kyu Won) Kim",
-  "Frederick Kim",
   "David Kosorin",
   "David Mordechai",
   "Dean Scarff",
@@ -852,6 +858,7 @@
   "Derrick",
   "Derry Tutt",
   "Deveesh Shetty",
+  "Dhruv",
   "Dimitri Tabatadze",
   "Dione",
   "Dishmemah",
@@ -865,11 +872,11 @@
   "Ed-k",
   "Eduard Stefanescu",
   "Eduardo Guzman-Diaz",
-  "Eduardo Paul",
-  "aindriu80",
+  "100daysummer",
   "ajay-vishnu",
   "akhilesh-w",
   "Akuna444",
+  "akshattkashyap",
   "AlJavhar",
   "Ale-Flash",
   "aescanes",
@@ -891,14 +898,13 @@
   "Ririshi",
   "radarmeanie",
   "Andreas",
-  "100daysummer",
   "14muffinz",
   "28Zapper",
   "47th",
   "ABHISHEKVALSAN",
   "Alex-Moberly",
   "AOTREVAI",
-  "soulninja-dev",
+  "aadtyn",
   "Hattorius",
   "eswaldots",
   "Aaryab1",
@@ -915,6 +921,7 @@
   "TheTempest76",
   "AfonsoVReis",
   "asmpro7",
+  "aindriu80",
   "Arthur Nunes",
   "Ashin Berish",
   "Ashiq Renju",
@@ -962,9 +969,10 @@
   "Aquaduckd",
   "KillerLava",
   "4rivappa",
-  "Zeden19",
-  "Arom1a",
+  "Arjun",
+  "Aromia",
   "AronF",
+  "KanatFM",
   "Lobsang Norbu",
   "Lodun Coombs",
   "Long Nguyen",
@@ -979,6 +987,7 @@
   "Lúmenn",
   "M4Dd0x is here !",
   "MD Jannatin Naim",
+  "Ma3ert",
   "Malki Abderrahmane",
   "Manassarn Manoonchai",
   "Manish Kumar",
@@ -989,7 +998,7 @@
   "Mark Stosberg",
   "Marken Foo",
   "Martin",
-  "KanatFM",
+  "Karthikeyan",
   "Katrina Lou S. Tantay",
   "Kavin Ruengprateepsang",
   "Kazeno",
@@ -1013,6 +1022,8 @@
   "Liande Guo",
   "Liewe Gutter",
   "Lindsey Peterson",
+  "Mirek Kudinoff",
+  "Mohanad Alrwaihy",
   "Mohit Paddhariya",
   "Moilleadoir",
   "MordecaiO",
@@ -1036,8 +1047,7 @@
   "Nikhil Harry",
   "Nikita Romanyuk",
   "Nikolai Maasø Lunde",
-  "Nikolai Ogorodnik",
-  "Nis-chal-Jain",
+  "Martin Namukombo",
   "Martin Trigaux",
   "Martin de Boutray",
   "Mateus Boergeson",
@@ -1060,8 +1070,7 @@
   "Mike Bart",
   "Mikhail Ivanov",
   "Ming",
-  "Mirek Kudinoff",
-  "Mohanad Alrwaihy",
+  "Frederick Kim",
   "Haruki Jay Shimada",
   "HasanTheSyrian",
   "Hector Queiróz",
diff --git a/package.json b/package.json
index dd670a5c8436..545739b3f052 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "monkeytype",
-  "version": "26.15.0",
+  "version": "26.19.0",
   "private": true,
   "license": "GPL-3.0",
   "type": "module",

From dec0e50f0c7210e6b76d07fe91e6f0887102d1bf Mon Sep 17 00:00:00 2001
From: Christian Fehmer <fehmer@users.noreply.github.com>
Date: Tue, 5 May 2026 09:32:22 +0200
Subject: [PATCH 3/5] fix(challenge): fix requirements (@fehmer) (#7863)

---
 frontend/static/challenges/_list.json | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/frontend/static/challenges/_list.json b/frontend/static/challenges/_list.json
index 15d430abeb95..a94b95aa6858 100644
--- a/frontend/static/challenges/_list.json
+++ b/frontend/static/challenges/_list.json
@@ -547,9 +547,6 @@
     "type": "funbox",
     "parameters": [["gibberish"], "time", 3600],
     "requirements": {
-      "wpm": {
-        "min": 100
-      },
       "time": {
         "min": 60
       },
@@ -565,9 +562,6 @@
     "type": "funbox",
     "parameters": [["specials"], "time", 3600],
     "requirements": {
-      "wpm": {
-        "min": 100
-      },
       "time": {
         "min": 60
       },
@@ -583,9 +577,6 @@
     "type": "funbox",
     "parameters": [["tts"], "time", 3600],
     "requirements": {
-      "wpm": {
-        "min": 100
-      },
       "time": {
         "min": 60
       },
@@ -601,9 +592,6 @@
     "type": "funbox",
     "parameters": [["ascii"], "time", 3600],
     "requirements": {
-      "wpm": {
-        "min": 100
-      },
       "time": {
         "min": 60
       },
@@ -619,9 +607,6 @@
     "type": "funbox",
     "parameters": [["sPoNgEcAsE"], "time", 3600],
     "requirements": {
-      "wpm": {
-        "min": 100
-      },
       "time": {
         "min": 60
       },
@@ -637,9 +622,6 @@
     "type": "funbox",
     "parameters": [["nausea"], "time", 3600],
     "requirements": {
-      "wpm": {
-        "min": 100
-      },
       "time": {
         "min": 60
       },
@@ -730,11 +712,8 @@
     "parameters": [],
     "message": "Complete a 10-word Master mode test using the Wingdings custom font. No keymap allowed. Minimum 60 WPM and 100% accuracy required.",
     "requirements": {
-      "wpm": {
-        "min": 60
-      },
       "acc": {
-        "min": 100
+        "exact": 100
       }
     }
   }

From 542fc722a6173b87ddaa00684ab6bc1a652200d8 Mon Sep 17 00:00:00 2001
From: Christian Fehmer <fehmer@users.noreply.github.com>
Date: Tue, 5 May 2026 09:36:42 +0200
Subject: [PATCH 4/5] fix(themes): don't leak custom theme css after preview
 (@fehmer) (#7876)

Fixes #7875

Slow network connections caused the theme css to be applied on the
#customTheme stylesheet link element after clearing the theme preview
with `href=""`.

Empty href is invalid, so best to remove the whole element if we don't
need it:

>The address of the link(s) is given by the href attribute. If the
[href](https://html.spec.whatwg.org/multipage/semantics.html#attr-link-href)
attribute is present, then its value must be a [valid non-empty URL
potentially surrounded by
spaces](https://html.spec.whatwg.org/multipage/urls-and-fetching.html#valid-non-empty-url-potentially-surrounded-by-spaces).

https://html.spec.whatwg.org/multipage/semantics.html#attr-link-href

While chrome is applying the last css file firefox removes it correctly
but keeps the loaderBar active because of the missing onLoad callback
---
 .../__tests__/components/core/Theme.spec.tsx  |  4 +--
 frontend/src/ts/components/core/Theme.tsx     | 34 +++++++++++++------
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/frontend/__tests__/components/core/Theme.spec.tsx b/frontend/__tests__/components/core/Theme.spec.tsx
index 5bd1a3b2ce29..35a2f5ec604e 100644
--- a/frontend/__tests__/components/core/Theme.spec.tsx
+++ b/frontend/__tests__/components/core/Theme.spec.tsx
@@ -85,13 +85,13 @@ describe("Theme component", () => {
   it("removes CSS when theme has no CSS", async () => {
     themeSignalMock.mockImplementation(() => ({ name: "light" }) as any);
     const { css } = renderComponent();
-    expect(css.getAttribute("href")).toBe("");
+    expect(css).not.toBeInTheDocument();
   });
 
   it("removes CSS when theme is custom", async () => {
     themeSignalMock.mockImplementation(() => ({ name: "custom" }) as any);
     const { css } = renderComponent();
-    expect(css.getAttribute("href")).toBe("");
+    expect(css).not.toBeInTheDocument();
   });
 
   it("handles CSS load error", () => {
diff --git a/frontend/src/ts/components/core/Theme.tsx b/frontend/src/ts/components/core/Theme.tsx
index c20457d05dd4..f04c85f6d287 100644
--- a/frontend/src/ts/components/core/Theme.tsx
+++ b/frontend/src/ts/components/core/Theme.tsx
@@ -1,5 +1,5 @@
 import { Link, Meta, MetaProvider, Style } from "@solidjs/meta";
-import { createEffect, createMemo, JSXElement } from "solid-js";
+import { createEffect, createMemo, JSXElement, Show } from "solid-js";
 
 import { themes } from "../../constants/themes";
 import { createDebouncedEffectOn } from "../../hooks/effects";
@@ -52,27 +52,39 @@ export function Theme(): JSXElement {
 }`);
   });
 
+  const isThemeWithCss = () => {
+    const name = getThemeName();
+    return name !== "custom" && (themes[name]?.hasCss ?? false);
+  };
+
   createEffect(() => {
     const name = getThemeName();
-    const hasCss = name !== "custom" && (themes[name].hasCss ?? false);
+    const hasCss = isThemeWithCss();
+
     console.debug(
       `Theme component ${hasCss ? "loading style" : "removing style"} for theme ${name}`,
     );
-    if (hasCss) showLoaderBar();
+    if (hasCss) {
+      showLoaderBar();
+    } else {
+      hideLoaderBar();
+    }
     linkEl()?.setAttribute("href", hasCss ? `/themes/${name}.css` : "");
   });
 
   return (
     <MetaProvider>
       <Style id="theme" ref={styleRef} />
-      <Link
-        ref={linkRef}
-        rel="stylesheet"
-        id="currentTheme"
-        data-name={getTheme().name}
-        onError={onError}
-        onLoad={onLoad}
-      />
+      <Show when={isThemeWithCss()}>
+        <Link
+          ref={linkRef}
+          rel="stylesheet"
+          id="currentTheme"
+          data-name={getTheme().name}
+          onError={onError}
+          onLoad={onLoad}
+        />
+      </Show>
       <Meta id="metaThemeColor" name="theme-color" content={getTheme().bg} />
       <FavIcon theme={getTheme()} />
     </MetaProvider>

From ba8c39c63a19ef62eeeebe369f17a64b7c48c3f0 Mon Sep 17 00:00:00 2001
From: Christian Fehmer <fehmer@users.noreply.github.com>
Date: Tue, 5 May 2026 09:38:53 +0200
Subject: [PATCH 5/5] fix(settings): show correct theme name on
 updateCustomTheme modal (@fehmer) (#7879)

fixes #7878
---
 frontend/src/ts/modals/simple-modals.ts | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/frontend/src/ts/modals/simple-modals.ts b/frontend/src/ts/modals/simple-modals.ts
index 8e415a364b82..2917a9fd3b8b 100644
--- a/frontend/src/ts/modals/simple-modals.ts
+++ b/frontend/src/ts/modals/simple-modals.ts
@@ -31,6 +31,7 @@ import {
 
 import { GenerateDataRequest } from "@monkeytype/contracts/dev";
 import {
+  CustomThemeNameSchema,
   PasswordSchema,
   UserEmailSchema,
   UserNameSchema,
@@ -40,6 +41,8 @@ import { z } from "zod";
 import { remoteValidation } from "../utils/remote-validation";
 import { list, PopupKey, showPopup } from "./simple-modals-base";
 import { getTheme } from "../states/theme";
+import { normalizeName } from "../utils/strings";
+import { IsValidResponse } from "../types/validation";
 
 export { list, showPopup };
 export type { PopupKey };
@@ -972,6 +975,14 @@ list.unlinkDiscord = new SimpleModal({
   },
 });
 
+const customThemeValidation = async (
+  name: string,
+): Promise<IsValidResponse> => {
+  const validationResult = CustomThemeNameSchema.safeParse(normalizeName(name));
+  if (validationResult.success) return true;
+  return validationResult.error.errors.map((err) => err.message).join(", ");
+};
+
 list.updateCustomTheme = new SimpleModal({
   id: "updateCustomTheme",
   title: "Update custom theme",
@@ -980,6 +991,7 @@ list.updateCustomTheme = new SimpleModal({
       type: "text",
       placeholder: "name",
       initVal: "",
+      validation: { isValid: customThemeValidation, debounceDelay: 0 },
     },
     {
       type: "checkbox",
@@ -1014,7 +1026,7 @@ list.updateCustomTheme = new SimpleModal({
         : customTheme.colors;
 
     const newTheme = {
-      name: name.replaceAll(" ", "_"),
+      name: normalizeName(name),
       colors: newColors,
     };
     const validation = await DB.editCustomTheme(customTheme._id, newTheme);
@@ -1040,7 +1052,10 @@ list.updateCustomTheme = new SimpleModal({
       (t) => t._id === _thisPopup.parameters[0],
     );
     if (!customTheme) return;
-    (_thisPopup.inputs[0] as TextInput).initVal = customTheme.name;
+    (_thisPopup.inputs[0] as TextInput).initVal = customTheme.name.replace(
+      /_/g,
+      " ",
+    );
   },
 });