diff --git a/backend/package.json b/backend/package.json
index cf5e7af0e6b7..18846ac2cfb5 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -80,13 +80,13 @@
     "@vitest/coverage-v8": "4.0.15",
     "concurrently": "8.2.2",
     "openapi3-ts": "2.0.2",
-    "oxlint": "1.50.0",
-    "oxlint-tsgolint": "0.14.2",
+    "oxlint": "1.57.0",
+    "oxlint-tsgolint": "0.17.3",
     "readline-sync": "1.4.10",
     "supertest": "7.1.4",
     "testcontainers": "11.11.0",
     "tsx": "4.21.0",
-    "typescript": "6.0.0-beta",
+    "typescript": "6.0.2",
     "vitest": "4.1.0",
     "yaml": "2.8.2"
   },
diff --git a/frontend/__tests__/components/ui/form/InputField.spec.tsx b/frontend/__tests__/components/ui/form/InputField.spec.tsx
index 7b5659ad14f1..4e79a6509cea 100644
--- a/frontend/__tests__/components/ui/form/InputField.spec.tsx
+++ b/frontend/__tests__/components/ui/form/InputField.spec.tsx
@@ -23,15 +23,6 @@ function makeField(name: string, value = "") {
 }
 
 describe("InputField", () => {
-  it("renders input with field name as id", () => {
-    const field = makeField("email");
-    render(() => <InputField field={() => field} />);
-
-    const input = screen.getByRole("textbox");
-    expect(input).toHaveAttribute("id", "email");
-    expect(input).toHaveAttribute("name", "email");
-  });
-
   it("uses field name as default placeholder", () => {
     const field = makeField("username");
     render(() => <InputField field={() => field} />);
diff --git a/frontend/package.json b/frontend/package.json
index 7bcd85ef1b08..7962b632563e 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -104,8 +104,8 @@
     "madge": "8.0.0",
     "magic-string": "0.30.17",
     "normalize.css": "8.0.1",
-    "oxlint": "1.50.0",
-    "oxlint-tsgolint": "0.14.2",
+    "oxlint": "1.57.0",
+    "oxlint-tsgolint": "0.17.3",
     "postcss": "8.5.8",
     "sass": "1.70.0",
     "solid-devtools": "0.34.5",
@@ -113,7 +113,7 @@
     "subset-font": "2.3.0",
     "tailwindcss": "4.1.18",
     "tsx": "4.21.0",
-    "typescript": "6.0.0-beta",
+    "typescript": "6.0.2",
     "unplugin-inject-preload": "3.0.0",
     "vite": "8.0.1",
     "vite-bundle-visualizer": "1.2.1",
@@ -126,7 +126,7 @@
   },
   "lint-staged": {
     "*": [
-      "oxfmt --no-error-on-unmatched-pattern"
+      "oxfmt --no-error-on-unmatched-pattern -c ../.oxfmtrc.json"
     ],
     "*.{ts,js,tsx}": [
       "oxlint --type-aware --type-check"
diff --git a/frontend/src/html/pages/test.html b/frontend/src/html/pages/test.html
index fa9ed4bd9913..de4b16820652 100644
--- a/frontend/src/html/pages/test.html
+++ b/frontend/src/html/pages/test.html
@@ -1,108 +1,6 @@
 <div class="page pageTest full-width content-grid hidden" data-nosnippet>
-  <div id="testConfig" class="full-width">
-    <div class="row">
-      <div class="puncAndNum">
-        <button class="textButton punctuationMode">
-          <i class="fas fa-fw fa-at"></i>
-          punctuation
-        </button>
-        <button class="textButton numbersMode">
-          <i class="fas fa-fw fa-hashtag"></i>
-          numbers
-        </button>
-      </div>
-
-      <div class="spacer leftSpacer"></div>
-
-      <div class="mode">
-        <button class="textButton" mode="time">
-          <i class="fas fa-fw fa-clock"></i>
-          time
-        </button>
-        <button class="textButton" mode="words">
-          <i class="fas fa-fw fa-font"></i>
-          words
-        </button>
-        <button class="textButton" mode="quote">
-          <i class="fas fa-fw fa-quote-left"></i>
-          quote
-        </button>
-        <button class="textButton" mode="zen">
-          <i class="fas fa-fw fa-mountain"></i>
-          zen
-        </button>
-        <button class="textButton" mode="custom">
-          <i class="fas fa-fw fa-wrench"></i>
-          custom
-        </button>
-      </div>
-
-      <div class="spacer rightSpacer"></div>
-
-      <div class="time">
-        <button class="textButton" timeConfig="15"><span>15</span></button>
-        <button class="textButton" timeConfig="30"><span>30</span></button>
-        <button class="textButton" timeConfig="60"><span>60</span></button>
-        <button class="textButton" timeConfig="120"><span>120</span></button>
-        <button class="textButton" timeConfig="custom">
-          <i class="fas fa-fw fa-tools"></i>
-        </button>
-      </div>
-
-      <div class="wordCount">
-        <button class="textButton" wordCount="10"><span>10</span></button>
-        <button class="textButton" wordCount="25"><span>25</span></button>
-        <button class="textButton" wordCount="50"><span>50</span></button>
-        <button class="textButton" wordCount="100"><span>100</span></button>
-        <button class="textButton" wordCount="custom">
-          <i class="fas fa-fw fa-tools"></i>
-        </button>
-      </div>
-
-      <div class="quoteLength">
-        <button class="textButton" quotelength="all">all</button>
-        <button class="textButton" quotelength="0">short</button>
-        <button class="textButton" quotelength="1">medium</button>
-        <button class="textButton" quotelength="2">long</button>
-        <button class="textButton" quotelength="3">thicc</button>
-        <button class="textButton favorite hidden" quotelength="-3">
-          <i class="fas fa-heart"></i>
-        </button>
-        <button class="textButton" quotelength="-2">
-          <i class="fas fa-search"></i>
-        </button>
-      </div>
-
-      <div class="zen">
-        <div
-          class="textButton"
-          style="
-            width: 0;
-            padding-left: 0;
-            padding-right: 0;
-            margin-left: 0;
-            margin-right: 0;
-          "
-        >
-           
-        </div>
-      </div>
-
-      <div class="customText">
-        <button class="textButton">change</button>
-      </div>
-    </div>
-    <button class="shareButton textButton">
-      <i class="fas fa-fw fa-share"></i>
-    </button>
-  </div>
+  <mount data-component="testconfig"></mount>
 
-  <div id="mobileTestConfigButton">
-    <button>
-      <i class="fas fa-fw fa-cog"></i>
-      Test settings
-    </button>
-  </div>
   <div id="testInitFailed" class="content-grid hidden">
     <div class="message">
       <div class="text">
diff --git a/frontend/src/html/popups.html b/frontend/src/html/popups.html
index c7396b69706e..4dd3c50507ed 100644
--- a/frontend/src/html/popups.html
+++ b/frontend/src/html/popups.html
@@ -131,108 +131,6 @@
   </div>
 </dialog>
 
-<dialog id="shareTestSettingsModal" class="modalWrapper hidden">
-  <!-- <div id="shareTestSettingsPopup"> -->
-  <div class="modal">
-    <div class="title">Share test settings</div>
-    <label class="checkboxWithSub mode">
-      <input type="checkbox" setting="mode" />
-      <div>Mode</div>
-      <div class="sub">Time, Words, Quote, Zen, Custom</div>
-    </label>
-    <label class="checkboxWithSub mode2 subgroup hidden">
-      <input type="checkbox" setting="mode2" />
-      <div>Mode2</div>
-      <div class="sub">Test seconds, Test words, Quote Id</div>
-    </label>
-    <label class="checkbox customText subgroup hidden">
-      <input type="checkbox" setting="customText" />
-      Custom text
-      <span></span>
-    </label>
-    <label class="checkbox punctuation">
-      <input type="checkbox" setting="punctuation" />
-      Punctuation
-      <span></span>
-    </label>
-    <label class="checkbox numbers">
-      <input type="checkbox" setting="numbers" />
-      Numbers
-      <span></span>
-    </label>
-    <label class="checkbox language">
-      <input type="checkbox" setting="language" />
-      Language
-      <span></span>
-    </label>
-    <label class="checkbox difficulty">
-      <input type="checkbox" setting="difficulty" />
-      Difficulty
-      <span></span>
-    </label>
-    <label class="checkbox funbox">
-      <input type="checkbox" setting="funbox" />
-      Funbox
-      <span></span>
-    </label>
-    <textarea
-      class="url"
-      placeholder="url"
-      value="monkeytype.com"
-      readonly
-    ></textarea>
-    <div class="tooLongWarning hidden">
-      <i class="fas fa-fw fa-exclamation-triangle"></i>
-      <span>The URL is over 2000 characters long - it might not work</span>
-    </div>
-    <!-- </div> -->
-  </div>
-</dialog>
-
-<dialog id="mobileTestConfigModal" class="modalWrapper hidden">
-  <div class="modal">
-    <div class="group">
-      <button class="punctuation">punctuation</button>
-      <button class="numbers">numbers</button>
-    </div>
-    <div class="group modeGroup">
-      <button data-mode="time">time</button>
-      <button class="active" data-mode="words">words</button>
-      <button data-mode="quote">quote</button>
-      <button data-mode="zen">zen</button>
-      <button data-mode="custom">custom</button>
-    </div>
-    <div class="group timeGroup">
-      <button data-time="15">15</button>
-      <button class="button active" data-time="30">30</button>
-      <button data-time="60">60</button>
-      <button data-time="120">120</button>
-      <button data-time="custom">custom</button>
-    </div>
-    <div class="group wordsGroup hidden">
-      <button data-words="10">10</button>
-      <button data-words="25">25</button>
-      <button data-words="50">50</button>
-      <button data-words="100">100</button>
-      <button data-words="custom">custom</button>
-    </div>
-    <div class="group quoteGroup hidden">
-      <button data-quoteLength="all">all</button>
-      <button data-quoteLength="0">short</button>
-      <button data-quoteLength="1">medium</button>
-      <button data-quoteLength="2">long</button>
-      <button data-quoteLength="3">thicc</button>
-      <button id="quote-search-button" data-quoteLength="-2">search</button>
-    </div>
-    <div class="group customGroup hidden">
-      <button class="customChange">change</button>
-    </div>
-    <div class="group">
-      <button class="shareButton">share</button>
-    </div>
-  </div>
-</dialog>
-
 <div id="videoAdPopupWrapper" class="popupWrapper hidden">
   <div id="videoAdPopup">
     <div class="preloader">
@@ -332,48 +230,6 @@
     <button>continue</button>
   </form>
 </dialog>
-<dialog id="customWordAmountModal" class="modalWrapper hidden">
-  <form class="modal">
-    <div class="title">Custom word amount</div>
-    <input type="number" value="1" min="0" max="10000" />
-    <div class="tip">
-      You can start an infinite test by inputting 0. Then, to stop the test, use
-      the Bail Out feature (
-      <kbd>esc</kbd>
-      or
-      <kbd>ctrl/cmd</kbd>
-      +
-      <kbd>shift</kbd>
-      +
-      <kbd>p</kbd>
-      > Bail Out)
-    </div>
-    <button>ok</button>
-  </form>
-</dialog>
-<dialog id="customTestDurationModal" class="modalWrapper hidden">
-  <form class="modal">
-    <div class="title">Test duration</div>
-    <div class="preview"></div>
-    <input value="1" title="test duration" min="0" />
-    <div class="tip">
-      You can use "h" for hours and "m" for minutes, for example "1h30m".
-      <br />
-      <br />
-      You can start an infinite test by inputting 0. Then, to stop the test, use
-      the Bail Out feature (
-      <kbd>esc</kbd>
-      or
-      <kbd>ctrl/cmd</kbd>
-      +
-      <kbd>shift</kbd>
-      +
-      <kbd>p</kbd>
-      > Bail Out)
-    </div>
-    <button>ok</button>
-  </form>
-</dialog>
 <dialog id="userReportModal" class="modalWrapper hidden">
   <div class="modal">
     <div class="title">Report a user</div>
diff --git a/frontend/src/styles/loading.scss b/frontend/src/styles/loading.scss
index 2ded452a64e3..fbad0bed09a5 100644
--- a/frontend/src/styles/loading.scss
+++ b/frontend/src/styles/loading.scss
@@ -38,12 +38,3 @@
     }
   }
 }
-
-body.loading {
-  header nav,
-  footer,
-  #testConfig {
-    pointer-events: none;
-    user-select: none;
-  }
-}
diff --git a/frontend/src/styles/media-queries-blue.scss b/frontend/src/styles/media-queries-blue.scss
index c7c24fb6c409..a19cc3c4c8f3 100644
--- a/frontend/src/styles/media-queries-blue.scss
+++ b/frontend/src/styles/media-queries-blue.scss
@@ -4,10 +4,6 @@
   .content-grid {
     --content-max-width: 640px;
   }
-  #testConfig {
-    font-size: 0.65rem;
-    --horizontalPadding: 0.55em;
-  }
   #testModesNotice {
     font-size: 0.8rem;
   }
diff --git a/frontend/src/styles/media-queries-green.scss b/frontend/src/styles/media-queries-green.scss
index b2989e3aa581..53bfd5534b82 100644
--- a/frontend/src/styles/media-queries-green.scss
+++ b/frontend/src/styles/media-queries-green.scss
@@ -4,10 +4,6 @@
   .content-grid {
     --content-max-width: 768px;
   }
-  #testConfig {
-    font-size: 0.7rem;
-    --horizontalPadding: 0.6em;
-  }
   .pageAccountSettings .main {
     gap: 2rem;
     .right .tab .section {
diff --git a/frontend/src/styles/media-queries-purple.scss b/frontend/src/styles/media-queries-purple.scss
index f698bc37f6f1..b52428e12f6d 100644
--- a/frontend/src/styles/media-queries-purple.scss
+++ b/frontend/src/styles/media-queries-purple.scss
@@ -30,12 +30,6 @@
     #liveStatsTextBottom {
       font-size: 12vw;
     }
-    #testConfig {
-      display: none;
-    }
-    #mobileTestConfigButton {
-      display: block;
-    }
     #result .wrapper {
       .stats {
         grid-template-columns: 1fr;
diff --git a/frontend/src/styles/popups.scss b/frontend/src/styles/popups.scss
index 58d80de8e022..5de0f1b4f917 100644
--- a/frontend/src/styles/popups.scss
+++ b/frontend/src/styles/popups.scss
@@ -153,38 +153,6 @@ body.darkMode {
   }
 }
 
-#mobileTestConfigModal {
-  .modal {
-    gap: 2rem;
-
-    .group {
-      display: grid;
-      gap: 0.5rem;
-    }
-  }
-}
-
-#customWordAmountModal {
-  .modal {
-    max-width: 500px;
-    .tip {
-      font-size: 0.75rem;
-      color: var(--text-color);
-    }
-  }
-}
-
-#customTestDurationModal {
-  .modal {
-    max-width: 500px;
-    .tip,
-    .preview {
-      font-size: 0.75rem;
-      color: var(--text-color);
-    }
-  }
-}
-
 #googleSignUpModal {
   .modal {
     max-width: 425px;
@@ -272,18 +240,6 @@ body.darkMode {
   }
 }
 
-#shareTestSettingsModal {
-  .modal {
-    max-width: 600px;
-    .subgroup {
-      padding-left: 2rem;
-    }
-    .tooLongWarning {
-      font-size: 0.75rem;
-      color: var(--error-color);
-    }
-  }
-}
 #cookiesModal {
   align-items: end;
   justify-items: end;
diff --git a/frontend/src/styles/test.scss b/frontend/src/styles/test.scss
index daa6e532be96..71abff85a54b 100644
--- a/frontend/src/styles/test.scss
+++ b/frontend/src/styles/test.scss
@@ -1346,131 +1346,6 @@
   }
 }
 
-#mobileTestConfigButton {
-  display: none;
-  justify-self: center;
-  margin-bottom: 1rem;
-  height: max-content;
-  button {
-    font-size: 0.75rem;
-    padding: 1em 2em;
-    color: var(--sub-color);
-    &:hover {
-      color: var(--bg-color);
-    }
-  }
-}
-
-#testConfig {
-  --horizontalPadding: 1em;
-  --verticalPadding: 1em;
-  display: grid;
-  font-size: 0.75rem;
-  gap: 0.5em;
-  grid-auto-flow: column;
-  height: max-content;
-  width: 100%;
-  transition: opacity 0.125s;
-  justify-content: space-around;
-  margin-bottom: 1rem;
-  width: max-content;
-  justify-self: center;
-  position: relative;
-
-  .puncAndNum {
-    // transition: 0.25s cubic-bezier(0.37, 0, 0.63, 1);
-    // overflow: hidden;
-    opacity: 1;
-  }
-  .row {
-    display: flex;
-    // padding: 0 0.5rem;
-    background: var(--sub-alt-color);
-    border-radius: var(--roundness);
-    z-index: 2;
-    // width: max-content;
-    overflow: hidden;
-  }
-  .spacer {
-    height: auto;
-    width: 0.5em;
-    border-radius: calc(var(--roundness) / 2);
-    background: var(--bg-color);
-    margin: 0.75em 0;
-  }
-
-  .wordCount,
-  .time,
-  .customText {
-    .textButton {
-      align-self: end;
-      span {
-        line-height: 1.15;
-      }
-    }
-  }
-
-  .mode,
-  .time,
-  .wordCount,
-  .puncAndNum,
-  .quoteLength,
-  .customText,
-  .zen {
-    display: grid;
-    grid-auto-flow: column;
-
-    .textButton {
-      padding: var(--verticalPadding) var(--horizontalPadding);
-
-      &:first-child {
-        margin-left: var(--horizontalPadding);
-      }
-      &:last-child {
-        margin-right: var(--horizontalPadding);
-      }
-      &:only-child {
-        margin-inline: var(--horizontalPadding);
-      }
-    }
-  }
-  .time,
-  .wordCount,
-  .customText,
-  .zen,
-  .quoteLength {
-    justify-content: end;
-  }
-  .puncAndNum {
-    justify-content: start;
-  }
-  .customText {
-    display: grid;
-  }
-  .shareButton {
-    position: absolute;
-    right: 0;
-    padding: var(--verticalPadding) var(--horizontalPadding);
-    z-index: 1;
-    transition:
-      opacity 0.25s,
-      right 0.25s;
-    opacity: 0;
-  }
-
-  .mode {
-    background: var(--sub-alt-color);
-    z-index: 2;
-  }
-
-  &:hover {
-    .shareButton {
-      opacity: 1;
-      right: calc((1.25em + (var(--horizontalPadding) * 2)) * -1);
-    }
-  }
-}
-
 .pageTest {
   height: 100%;
   display: grid;
@@ -1626,9 +1501,7 @@
 }
 
 main.focus .pageTest {
-  #testModesNotice,
-  #testConfig,
-  #mobileTestConfigButton {
+  #testModesNotice {
     opacity: 0 !important;
   }
   #restartTestButton {
diff --git a/frontend/src/ts/commandline/lists.ts b/frontend/src/ts/commandline/lists.ts
index a5a09d372824..7f9917222cb3 100644
--- a/frontend/src/ts/commandline/lists.ts
+++ b/frontend/src/ts/commandline/lists.ts
@@ -28,7 +28,6 @@ import {
   clearAllNotifications,
 } from "../states/notifications";
 import * as VideoAdPopup from "../popups/video-ad-popup";
-import * as ShareTestSettingsPopup from "../modals/share-test-settings";
 import * as TestStats from "../test/test-stats";
 import { Command, CommandsSubgroup } from "./types";
 import { buildCommandForConfigKey } from "./util";
@@ -97,8 +96,8 @@ export const commands: CommandsSubgroup = {
       id: "shareTestSettings",
       display: "Share test settings",
       icon: "fa-share",
-      exec: async (): Promise<void> => {
-        ShareTestSettingsPopup.show();
+      exec: (): void => {
+        showModal("ShareTestSettings");
       },
     },
 
diff --git a/frontend/src/ts/components/common/anime/AnimeShow.tsx b/frontend/src/ts/components/common/anime/AnimeShow.tsx
index cd93227d0408..00899655f4e7 100644
--- a/frontend/src/ts/components/common/anime/AnimeShow.tsx
+++ b/frontend/src/ts/components/common/anime/AnimeShow.tsx
@@ -1,7 +1,7 @@
 import { AnimationParams } from "animejs";
 import { JSXElement, ParentProps, Show } from "solid-js";
 
-import { Anime } from "./Anime";
+import { Anime, AnimeProps } from "./Anime";
 import { AnimePresence } from "./AnimePresence";
 
 /**
@@ -33,6 +33,7 @@ export function AnimeShow(
     slide?: true;
     duration?: number;
     class?: string;
+    animeProps?: Partial<AnimeProps>;
   }>,
 ): JSXElement {
   const duration = () => props.duration ?? 125;
@@ -47,6 +48,7 @@ export function AnimeShow(
               initial={{ opacity: 0 } as Partial<AnimationParams>}
               animate={{ opacity: 1, duration: duration() } as AnimationParams}
               exit={{ opacity: 0, duration: duration() } as AnimationParams}
+              {...props.animeProps}
               class={props.class}
             >
               {props.children}
@@ -64,6 +66,7 @@ export function AnimeShow(
             }
             exit={{ height: 0, duration: duration() } as AnimationParams}
             style={{ overflow: "hidden" }}
+            {...props.animeProps}
             class={props.class}
           >
             {props.children}
diff --git a/frontend/src/ts/components/modals/CustomTestDurationModal.tsx b/frontend/src/ts/components/modals/CustomTestDurationModal.tsx
new file mode 100644
index 000000000000..306098271e36
--- /dev/null
+++ b/frontend/src/ts/components/modals/CustomTestDurationModal.tsx
@@ -0,0 +1,156 @@
+import { createForm } from "@tanstack/solid-form";
+import { JSXElement } from "solid-js";
+
+import { setConfig } from "../../config/setters";
+import { getConfig } from "../../config/store";
+import { restartTestEvent } from "../../states/core";
+import { hideModalAndClearChain } from "../../states/modals";
+import { showNoticeNotification } from "../../states/notifications";
+import { AnimatedModal } from "../common/AnimatedModal";
+import { InputField } from "../ui/form/InputField";
+import { SubmitButton } from "../ui/form/SubmitButton";
+
+export function CustomTestDurationModal(): JSXElement {
+  const form = createForm(() => ({
+    defaultValues: {
+      duration: getConfig.time.toString(),
+    },
+    onSubmit: ({ value }) => {
+      const val = parseInput(value.duration);
+
+      if (isNaN(val) || val < 0 || !isFinite(val)) {
+        showNoticeNotification("Custom time must be a positive number or zero");
+        return;
+      }
+
+      setConfig("time", val);
+      restartTestEvent.dispatch();
+
+      if (val >= 1800) {
+        showNoticeNotification("Stay safe and take breaks!");
+      } else if (val === 0) {
+        showNoticeNotification(
+          "Infinite time! Make sure to use Bail Out from the command line to save your result.",
+          { durationMs: 7000 },
+        );
+      }
+
+      hideModalAndClearChain("TestDuration");
+    },
+  }));
+
+  const durationValue = form.useStore((s) => s.values.duration);
+
+  const humanTime = () => {
+    const duration = parseInput(durationValue());
+
+    if (duration < 0) {
+      return "Negative time? Really?";
+    } else if (duration === 0) {
+      return "Infinite test";
+    } else {
+      return format(duration);
+    }
+  };
+
+  return (
+    <AnimatedModal
+      id="TestDuration"
+      title="Test Duration"
+      beforeShow={() => {
+        form.reset({ duration: getConfig.time.toString() });
+      }}
+    >
+      <form
+        class="grid gap-4"
+        onSubmit={(e) => {
+          e.preventDefault();
+          e.stopPropagation();
+          void form.handleSubmit();
+        }}
+      >
+        <div class="text-xs">{humanTime()}</div>
+        <form.Field
+          name="duration"
+          validators={{
+            onChange: ({ value }) => {
+              const val = parseInput(value);
+              if (isNaN(val) || !isFinite(val)) return "Must be a number";
+              if (val < 0) return "Must be non-negative";
+              return undefined;
+            },
+          }}
+          children={(field) => (
+            <InputField field={field} type="text" placeholder="duration" />
+          )}
+        />
+        <div class="text-xs">
+          You can use &ldquo;h&rdquo; for hours and &ldquo;m&rdquo; for minutes,
+          for example &ldquo;1h30m&rdquo;.
+          <br />
+          <br />
+          You can start an infinite test by inputting 0. Then, to stop the test,
+          use the Bail Out feature:
+          <br />(<kbd>esc</kbd> or <kbd>ctrl/cmd</kbd> + <kbd>shift</kbd> +{" "}
+          <kbd>p</kbd> &gt; Bail Out)
+        </div>
+        <SubmitButton
+          form={form}
+          variant="button"
+          text="apply"
+          skipDirtyCheck
+        />
+      </form>
+    </AnimatedModal>
+  );
+}
+
+function format(duration: number): string {
+  const hours = Math.floor(duration / 3600);
+  const minutes = Math.floor((duration % 3600) / 60);
+  const seconds = duration % 60;
+
+  const time = [];
+
+  if (hours > 0) {
+    time.push(`${hours} hour${hours === 1 ? "" : "s"}`);
+  }
+
+  if (minutes > 0) {
+    time.push(`${minutes} minute${minutes === 1 ? "" : "s"}`);
+  }
+
+  if (seconds > 0) {
+    time.push(`${seconds} second${seconds === 1 ? "" : "s"}`);
+  }
+
+  if (time.length === 0) {
+    return "0 seconds";
+  } else if (time.length === 3) {
+    return `${time[0]}, ${time[1]} and ${time[2]}`;
+  } else if (time.length === 2) {
+    return `${time[0]} and ${time[1]}`;
+  } else {
+    return `${time[0]}`;
+  }
+}
+
+function parseInput(input: string): number {
+  const re = /((-\s*)?\d+(\.\d+)?\s*[hms]?)/g;
+  const seconds = [...input.toLowerCase().matchAll(re)]
+    .map((match) => {
+      const part = match[0];
+      const duration = parseFloat(part.replace(/\s+/g, ""));
+
+      if (part.includes("h")) {
+        return 3600 * duration;
+      } else if (part.includes("m")) {
+        return 60 * duration;
+      } else {
+        return duration;
+      }
+    })
+    .reduce((total, dur) => total + dur, 0);
+
+  return Math.floor(seconds);
+}
diff --git a/frontend/src/ts/components/modals/CustomWordAmountModal.tsx b/frontend/src/ts/components/modals/CustomWordAmountModal.tsx
new file mode 100644
index 000000000000..4f277ef0959e
--- /dev/null
+++ b/frontend/src/ts/components/modals/CustomWordAmountModal.tsx
@@ -0,0 +1,83 @@
+import { createForm } from "@tanstack/solid-form";
+import { JSXElement } from "solid-js";
+
+import { setConfig } from "../../config/setters";
+import { getConfig } from "../../config/store";
+import { restartTestEvent } from "../../states/core";
+import { hideModalAndClearChain } from "../../states/modals";
+import { showNoticeNotification } from "../../states/notifications";
+import { AnimatedModal } from "../common/AnimatedModal";
+import { InputField } from "../ui/form/InputField";
+import { SubmitButton } from "../ui/form/SubmitButton";
+
+export function CustomWordAmountModal(): JSXElement {
+  const form = createForm(() => ({
+    defaultValues: {
+      words: getConfig.words.toString(),
+    },
+    onSubmit: ({ value }) => {
+      const val = parseInt(value.words, 10);
+
+      setConfig("words", val);
+      restartTestEvent.dispatch();
+
+      if (val > 2000) {
+        showNoticeNotification("Stay safe and take breaks!");
+      } else if (val === 0) {
+        showNoticeNotification(
+          "Infinite words! Make sure to use Bail Out from the command line to save your result.",
+          { durationMs: 7000 },
+        );
+      }
+
+      hideModalAndClearChain("CustomWordAmount");
+    },
+  }));
+
+  return (
+    <AnimatedModal
+      id="CustomWordAmount"
+      title="Custom word amount"
+      focusFirstInput="focusAndSelect"
+      beforeShow={() => {
+        form.reset({ words: getConfig.words.toString() });
+      }}
+    >
+      <form
+        class="grid gap-4"
+        onSubmit={(e) => {
+          e.preventDefault();
+          e.stopPropagation();
+          void form.handleSubmit();
+        }}
+      >
+        <form.Field
+          name="words"
+          validators={{
+            onChange: ({ value }) => {
+              const val = parseInt(value, 10);
+              if (isNaN(val) || !isFinite(val)) return "Must be a number";
+              if (val < 0) return "Must be non-negative";
+              return undefined;
+            },
+          }}
+          children={(field) => (
+            <InputField field={field} type="number" placeholder="word amount" />
+          )}
+        />
+        <div class="text-xs">
+          You can start an infinite test by inputting 0. Then, to stop the test,
+          use the Bail Out feature:
+          <br />(<kbd>esc</kbd> or <kbd>ctrl/cmd</kbd> + <kbd>shift</kbd> +{" "}
+          <kbd>p</kbd> &gt; Bail Out)
+        </div>
+        <SubmitButton
+          form={form}
+          variant="button"
+          text="apply"
+          skipDirtyCheck
+        />
+      </form>
+    </AnimatedModal>
+  );
+}
diff --git a/frontend/src/ts/components/modals/MobileTestConfigModal.tsx b/frontend/src/ts/components/modals/MobileTestConfigModal.tsx
new file mode 100644
index 000000000000..79a8d6b58488
--- /dev/null
+++ b/frontend/src/ts/components/modals/MobileTestConfigModal.tsx
@@ -0,0 +1,211 @@
+import type {
+  QuoteLength,
+  QuoteLengthConfig,
+} from "@monkeytype/schemas/configs";
+import type { Mode } from "@monkeytype/schemas/shared";
+
+import { For, JSXElement, Show } from "solid-js";
+
+import { setConfig, setQuoteLengthAll } from "../../config/setters";
+import { getConfig } from "../../config/store";
+import { isLoggedIn, restartTestEvent } from "../../states/core";
+import { showModal } from "../../states/modals";
+import { areUnsortedArraysEqual } from "../../utils/arrays";
+import { AnimatedModal } from "../common/AnimatedModal";
+import { Button } from "../common/Button";
+import { Separator } from "../common/Separator";
+
+const modes: Mode[] = ["time", "words", "quote", "zen", "custom"];
+const times = [15, 30, 60, 120];
+const wordCounts = [10, 25, 50, 100];
+
+const quoteLengths: {
+  value: string;
+  label: string;
+  loginRequired?: boolean;
+}[] = [
+  { value: "all", label: "all" },
+  { value: "0", label: "short" },
+  { value: "1", label: "medium" },
+  { value: "2", label: "long" },
+  { value: "3", label: "thicc" },
+  { value: "-3", label: "favorite", loginRequired: true },
+  { value: "-2", label: "search" },
+] as const;
+
+function MCButton(props: {
+  text: string;
+  active?: boolean;
+  disabled?: boolean;
+  onClick: (e: MouseEvent) => void;
+}): JSXElement {
+  return (
+    <Button
+      variant="button"
+      text={props.text}
+      active={props.active}
+      disabled={props.disabled}
+      onClick={props.onClick}
+    />
+  );
+}
+
+const isPunctuationDisabled = () =>
+  getConfig.mode === "quote" || getConfig.mode === "zen";
+
+export function MobileTestConfigModal(): JSXElement {
+  const handleModeClick = (mode: Mode) => {
+    if (mode === getConfig.mode) return;
+    setConfig("mode", mode);
+    restartTestEvent.dispatch();
+  };
+
+  const handleTimeClick = (time: number | "custom") => {
+    if (time === "custom") {
+      showModal("TestDuration");
+    } else {
+      setConfig("time", time);
+      restartTestEvent.dispatch();
+    }
+  };
+
+  const handleWordsClick = (words: number | "custom") => {
+    if (words === "custom") {
+      showModal("CustomWordAmount");
+    } else {
+      setConfig("words", words);
+      restartTestEvent.dispatch();
+    }
+  };
+
+  const handleQuoteLengthClick = (value: string, e: MouseEvent) => {
+    if (value === "all") {
+      if (setQuoteLengthAll()) {
+        restartTestEvent.dispatch();
+      }
+    } else if (value === "-2") {
+      showModal("QuoteSearch");
+    } else {
+      const len = parseInt(value, 10) as QuoteLength;
+      let arr: QuoteLengthConfig;
+
+      if (e.shiftKey) {
+        arr = [...getConfig.quoteLength, len];
+      } else {
+        arr = [len];
+      }
+
+      if (setConfig("quoteLength", arr)) {
+        restartTestEvent.dispatch();
+      }
+    }
+  };
+
+  const isQuoteLengthActive = (value: string) => {
+    if (value === "all") {
+      return areUnsortedArraysEqual(getConfig.quoteLength, [0, 1, 2, 3]);
+    }
+    if (value === "-2") return false;
+    if (value === "-3") {
+      return areUnsortedArraysEqual(getConfig.quoteLength, [-3]);
+    }
+    return getConfig.quoteLength.includes(parseInt(value, 10) as QuoteLength);
+  };
+
+  return (
+    <AnimatedModal id="MobileTestConfig" modalClass="grid gap-4">
+      <div class="grid gap-2">
+        <MCButton
+          text="punctuation"
+          active={getConfig.punctuation && !isPunctuationDisabled()}
+          disabled={isPunctuationDisabled()}
+          onClick={() => {
+            setConfig("punctuation", !getConfig.punctuation);
+            restartTestEvent.dispatch();
+          }}
+        />
+        <MCButton
+          text="numbers"
+          active={getConfig.numbers && !isPunctuationDisabled()}
+          disabled={isPunctuationDisabled()}
+          onClick={() => {
+            setConfig("numbers", !getConfig.numbers);
+            restartTestEvent.dispatch();
+          }}
+        />
+      </div>
+
+      <Separator />
+
+      <div class="grid gap-2">
+        <For each={modes}>
+          {(mode) => (
+            <MCButton
+              text={mode}
+              active={getConfig.mode === mode}
+              onClick={() => handleModeClick(mode)}
+            />
+          )}
+        </For>
+      </div>
+
+      <Separator />
+
+      <Show when={getConfig.mode !== "zen"}>
+        <div class="grid gap-2">
+          <Show when={getConfig.mode === "time"}>
+            <For each={times}>
+              {(time) => (
+                <MCButton
+                  text={String(time)}
+                  active={getConfig.time === time}
+                  onClick={() => handleTimeClick(time)}
+                />
+              )}
+            </For>
+            <MCButton text="custom" onClick={() => handleTimeClick("custom")} />
+          </Show>
+
+          <Show when={getConfig.mode === "words"}>
+            <For each={wordCounts}>
+              {(words) => (
+                <MCButton
+                  text={String(words)}
+                  active={getConfig.words === words}
+                  onClick={() => handleWordsClick(words)}
+                />
+              )}
+            </For>
+            <MCButton
+              text="custom"
+              onClick={() => handleWordsClick("custom")}
+            />
+          </Show>
+
+          <Show when={getConfig.mode === "quote"}>
+            <For each={quoteLengths}>
+              {(ql) => (
+                <Show when={!("loginRequired" in ql) || isLoggedIn()}>
+                  <MCButton
+                    text={ql.label}
+                    active={isQuoteLengthActive(ql.value)}
+                    onClick={(e) => handleQuoteLengthClick(ql.value, e)}
+                  />
+                </Show>
+              )}
+            </For>
+          </Show>
+
+          <Show when={getConfig.mode === "custom"}>
+            <MCButton text="change" onClick={() => showModal("CustomText")} />
+          </Show>
+        </div>
+        <Separator />
+      </Show>
+
+      <div class="grid gap-2">
+        <MCButton text="share" onClick={() => showModal("ShareTestSettings")} />
+      </div>
+    </AnimatedModal>
+  );
+}
diff --git a/frontend/src/ts/components/modals/Modals.tsx b/frontend/src/ts/components/modals/Modals.tsx
index c219544da7b6..08503c2ba401 100644
--- a/frontend/src/ts/components/modals/Modals.tsx
+++ b/frontend/src/ts/components/modals/Modals.tsx
@@ -1,11 +1,15 @@
 import { JSXElement } from "solid-js";
 
 import { ContactModal } from "./ContactModal";
+import { CustomTestDurationModal } from "./CustomTestDurationModal";
 import { CustomTextModal } from "./CustomTextModal";
+import { CustomWordAmountModal } from "./CustomWordAmountModal";
+import { MobileTestConfigModal } from "./MobileTestConfigModal";
 import { QuoteRateModal } from "./QuoteRateModal";
 import { QuoteReportModal } from "./QuoteReportModal";
 import { QuoteSearchModal } from "./QuoteSearchModal";
 import { RegisterCaptchaModal } from "./RegisterCaptchaModal";
+import { ShareTestSettings } from "./ShareTestSettings";
 import { SimpleModal } from "./SimpleModal";
 import { SupportModal } from "./SupportModal";
 import { VersionHistoryModal } from "./VersionHistoryModal";
@@ -22,6 +26,10 @@ export function Modals(): JSXElement {
       <QuoteRateModal />
       <QuoteReportModal />
       <QuoteSearchModal />
+      <CustomTestDurationModal />
+      <CustomWordAmountModal />
+      <ShareTestSettings />
+      <MobileTestConfigModal />
     </>
   );
 }
diff --git a/frontend/src/ts/components/modals/ShareTestSettings.tsx b/frontend/src/ts/components/modals/ShareTestSettings.tsx
new file mode 100644
index 000000000000..48b68f961780
--- /dev/null
+++ b/frontend/src/ts/components/modals/ShareTestSettings.tsx
@@ -0,0 +1,271 @@
+import type { Difficulty, FunboxName } from "@monkeytype/schemas/configs";
+import type { CustomTextSettings } from "@monkeytype/schemas/results";
+import type { Mode, Mode2 } from "@monkeytype/schemas/shared";
+
+import { createForm } from "@tanstack/solid-form";
+import { compressToURI } from "lz-ts";
+import { JSXElement, Show } from "solid-js";
+
+import { getConfig } from "../../config/store";
+import { showSuccessNotification } from "../../states/notifications";
+import * as CustomText from "../../test/custom-text";
+import { currentQuote } from "../../test/test-words";
+import { cn } from "../../utils/cn";
+import { getMode2 } from "../../utils/misc";
+import { capitalizeFirstLetter } from "../../utils/strings";
+import { AnimatedModal } from "../common/AnimatedModal";
+import { Button } from "../common/Button";
+import { Fa } from "../common/Fa";
+import { Checkbox } from "../ui/form/Checkbox";
+
+type SharedTestSettings = [
+  Mode | null,
+  Mode2<Mode> | null,
+  CustomTextSettings | null,
+  boolean | null,
+  boolean | null,
+  string | null,
+  Difficulty | null,
+  FunboxName[] | null,
+];
+
+export function ShareTestSettings(): JSXElement {
+  const form = createForm(() => ({
+    defaultValues: {
+      mode: false,
+      mode2: false,
+      customText: false,
+      punctuation: false,
+      numbers: false,
+      language: false,
+      difficulty: false,
+      funbox: false,
+    },
+  }));
+
+  const formValues = form.useStore((s) => s.values);
+
+  const url = () => {
+    const baseUrl = location.origin + "?testSettings=";
+    const settings: SharedTestSettings = new Array(8).fill(
+      null,
+    ) as SharedTestSettings;
+    const values = formValues();
+
+    const settingsMap = [
+      { enabled: values.mode, getValue: () => getConfig.mode },
+      {
+        enabled: values.mode2,
+        getValue: () => getMode2(getConfig, currentQuote),
+      },
+      { enabled: values.customText, getValue: () => CustomText.getData() },
+      { enabled: values.punctuation, getValue: () => getConfig.punctuation },
+      { enabled: values.numbers, getValue: () => getConfig.numbers },
+      { enabled: values.language, getValue: () => getConfig.language },
+      { enabled: values.difficulty, getValue: () => getConfig.difficulty },
+      { enabled: values.funbox, getValue: () => getConfig.funbox },
+    ];
+
+    for (const [index, { enabled, getValue }] of settingsMap.entries()) {
+      if (enabled) {
+        settings[index] = getValue();
+      }
+    }
+
+    const compressed = compressToURI(JSON.stringify(settings));
+    return baseUrl + compressed;
+  };
+
+  const mode2subtext = () => {
+    let out = "";
+    if (getConfig.mode === "quote") {
+      out += "Quote ID ";
+    }
+    out += capitalizeFirstLetter(getMode2(getConfig, currentQuote) || "none");
+
+    if (getConfig.mode === "time") {
+      out += " seconds";
+    }
+    if (getConfig.mode === "words") {
+      out += " words";
+    }
+
+    return out;
+  };
+
+  return (
+    <AnimatedModal id="ShareTestSettings" title="Share test settings">
+      <form.Field name="mode">
+        {(field) => (
+          <Checkbox
+            field={() => field()}
+            class="items-start"
+            label={
+              <div>
+                <div>Mode</div>
+                <div class="text-em-xs text-sub">
+                  {capitalizeFirstLetter(getConfig.mode)}
+                </div>
+              </div>
+            }
+          />
+        )}
+      </form.Field>
+
+      <Show when={getConfig.mode === "custom"}>
+        <form.Field name="customText">
+          {(field) => (
+            <Checkbox
+              field={() => field()}
+              class={cn(
+                "ml-8 items-start",
+                formValues().mode ? "" : "pointer-events-none opacity-33",
+              )}
+              label={
+                <div>
+                  <div>Custom text</div>
+                  <div class="text-em-xs text-sub">
+                    {CustomText.getData().text.length}{" "}
+                    {CustomText.getData().pipeDelimiter ? "sections" : "words"},{" "}
+                    {CustomText.getData().mode} mode,{" "}
+                    {CustomText.getData().limit.value}{" "}
+                    {CustomText.getData().limit.mode} limit
+                  </div>
+                </div>
+              }
+            />
+          )}
+        </form.Field>
+      </Show>
+      <Show when={getConfig.mode !== "custom" && getConfig.mode !== "zen"}>
+        <form.Field name="mode2">
+          {(field) => (
+            <Checkbox
+              field={() => field()}
+              class={cn(
+                "ml-8 items-start",
+                formValues().mode ? "" : "pointer-events-none opacity-33",
+              )}
+              label={
+                <div>
+                  <div>Mode2</div>
+                  <div class="text-em-xs text-sub">{mode2subtext()}</div>
+                </div>
+              }
+            />
+          )}
+        </form.Field>
+      </Show>
+
+      <Show when={getConfig.mode !== "zen"}>
+        <form.Field name="punctuation">
+          {(field) => (
+            <Checkbox
+              field={() => field()}
+              class="items-start"
+              label={
+                <div>
+                  <div>Punctuation</div>
+                  <div class="text-em-xs text-sub">
+                    {getConfig.punctuation ? "enabled" : "disabled"}
+                  </div>
+                </div>
+              }
+            />
+          )}
+        </form.Field>
+        <form.Field name="numbers">
+          {(field) => (
+            <Checkbox
+              field={() => field()}
+              class="items-start"
+              label={
+                <div>
+                  <div>Numbers</div>
+                  <div class="text-em-xs text-sub">
+                    {getConfig.numbers ? "enabled" : "disabled"}
+                  </div>
+                </div>
+              }
+            />
+          )}
+        </form.Field>
+        <form.Field name="language">
+          {(field) => (
+            <Checkbox
+              field={() => field()}
+              class="items-start"
+              label={
+                <div>
+                  <div>Language</div>
+                  <div class="text-em-xs text-sub">{getConfig.language}</div>
+                </div>
+              }
+            />
+          )}
+        </form.Field>
+        <form.Field name="difficulty">
+          {(field) => (
+            <Checkbox
+              field={() => field()}
+              class="items-start"
+              label={
+                <div>
+                  <div>Difficulty</div>
+                  <div class="text-em-xs text-sub">{getConfig.difficulty}</div>
+                </div>
+              }
+            />
+          )}
+        </form.Field>
+      </Show>
+      <form.Field name="funbox">
+        {(field) => (
+          <Checkbox
+            field={() => field()}
+            class="items-start"
+            label={
+              <div>
+                <div>Funbox</div>
+                <div class="text-em-xs text-sub">
+                  {getConfig.funbox.length > 0
+                    ? getConfig.funbox.join(", ")
+                    : `none`}
+                </div>
+              </div>
+            }
+          />
+        )}
+      </form.Field>
+      <textarea
+        placeholder="url"
+        value={url()}
+        readOnly
+        onClick={(e) => e.currentTarget.select()}
+      ></textarea>
+      <Button
+        variant="button"
+        text="copy to clipboard"
+        fa={{
+          icon: "fa-copy",
+        }}
+        onClick={() => {
+          void navigator.clipboard
+            .writeText(url())
+            .then(() => {
+              showSuccessNotification("URL copied to clipboard");
+            })
+            .catch((error: unknown) => {
+              showSuccessNotification("Failed to copy URL", { error });
+            });
+        }}
+      />
+      <Show when={url().length > 2000}>
+        <div class="flex place-items-center gap-2 text-xs text-error">
+          <Fa icon="fa-exclamation-triangle" />
+          <span>The URL is over 2000 characters long - it might not work</span>
+        </div>
+      </Show>
+    </AnimatedModal>
+  );
+}
diff --git a/frontend/src/ts/components/mount.tsx b/frontend/src/ts/components/mount.tsx
index 7e96184bfe23..cdcd5667ffa8 100644
--- a/frontend/src/ts/components/mount.tsx
+++ b/frontend/src/ts/components/mount.tsx
@@ -16,6 +16,7 @@ import { LeaderboardPage } from "./pages/leaderboard/LeaderboardPage";
 import { LoginPage } from "./pages/login/LoginPage";
 import { ProfilePage } from "./pages/profile/ProfilePage";
 import { ProfileSearchPage } from "./pages/profile/ProfileSearchPage";
+import { TestConfig } from "./pages/test/TestConfig";
 import { Popups } from "./popups/Popups";
 
 const components: Record<string, () => JSXElement> = {
@@ -32,6 +33,7 @@ const components: Record<string, () => JSXElement> = {
   theme: () => <Theme />,
   header: () => <Header />,
   devtools: () => <DevTools />,
+  testconfig: () => <TestConfig />,
 };
 
 function mountToMountpoint(name: string, component: () => JSXElement): void {
diff --git a/frontend/src/ts/components/pages/test/TestConfig.tsx b/frontend/src/ts/components/pages/test/TestConfig.tsx
new file mode 100644
index 000000000000..b9e59a340639
--- /dev/null
+++ b/frontend/src/ts/components/pages/test/TestConfig.tsx
@@ -0,0 +1,395 @@
+import { ComponentProps, For, JSXElement, Show } from "solid-js";
+
+import { setConfig, setQuoteLengthAll } from "../../../config/setters";
+import { getConfig } from "../../../config/store";
+import { createEffectOn } from "../../../hooks/effects";
+import { useRefWithUtils } from "../../../hooks/useRefWithUtils";
+import {
+  getFocus,
+  getResultVisible,
+  isLoggedIn,
+  restartTestEvent,
+} from "../../../states/core";
+import { showModal } from "../../../states/modals";
+import { FaSolidIcon } from "../../../types/font-awesome";
+import { areUnsortedArraysEqual } from "../../../utils/arrays";
+import { cn } from "../../../utils/cn";
+import { Anime, AnimeShow } from "../../common/anime";
+import { Button } from "../../common/Button";
+
+const variables = cn(
+  "[--card-gap:0.25em] [--font-size:0.6em] [--horizontal-padding:0.4em] [--vertical-padding:0.7rem]",
+  "md:[--card-gap:1em] md:[--font-size:0.7em] md:[--horizontal-padding:0.45em]",
+  "lg:[--card-gap:1em] lg:[--font-size:0.75em] lg:[--horizontal-padding:0.75em]",
+  "xl:[--card-gap:2em] xl:[--font-size:0.75em] xl:[--horizontal-padding:1em]",
+);
+const buttonClass = "px-(--horizontal-padding) py-(--vertical-padding)";
+const cardClass =
+  "card rounded-(--roundness) bg-sub-alt px-(--horizontal-padding)";
+const durationMs = 250;
+
+export function TestConfig(): JSXElement {
+  return (
+    <>
+      <div
+        class={cn(
+          variables,
+          "group relative mb-8 hidden w-max grid-cols-[1fr_auto_1fr] justify-center place-self-center [font-size:var(--font-size)] sm:grid",
+          "transition-opacity duration-125",
+          getFocus() || getResultVisible()
+            ? "pointer-events-none opacity-0"
+            : "",
+        )}
+        data-ui-element="testConfig"
+      >
+        <PuncAndNum />
+        <Mode />
+        <Mode2 />
+      </div>
+      <Button
+        class={cn("flex place-self-center px-4 py-2 text-sub sm:hidden")}
+        variant="button"
+        onClick={() => {
+          showModal("MobileTestConfig");
+        }}
+        text="test settings"
+        fa={{
+          icon: "fa-cog",
+        }}
+      />
+    </>
+  );
+}
+
+function TCButton(props: {
+  icon: FaSolidIcon;
+  text: string;
+  active?: boolean;
+  disabled?: boolean;
+  onClick: () => void;
+}): JSXElement {
+  return (
+    <Button
+      variant="text"
+      class={cn(buttonClass)}
+      fa={{ icon: props.icon, fixedWidth: true }}
+      text={props.text}
+      active={props.active}
+      onClick={props.onClick}
+      disabled={props.disabled}
+    />
+  );
+}
+
+function PuncAndNum(): JSXElement {
+  const buttons = [
+    { icon: "fa-at", configKey: "punctuation" },
+    { icon: "fa-hashtag", configKey: "numbers" },
+  ] as const;
+
+  return (
+    <Anime
+      class="mr-(--card-gap) w-max place-self-end"
+      animation={{
+        opacity: getConfig.mode === "zen" ? 0 : 1,
+        // marginRight: getConfig.mode === "zen" ? "0" : "var(--card-gap)",
+        duration: durationMs,
+      }}
+    >
+      <AnimeShow when={getConfig.mode !== "zen"} duration={durationMs}>
+        <div class={cardClass}>
+          <For each={buttons}>
+            {({ icon, configKey }) => (
+              <TCButton
+                icon={icon}
+                text={configKey}
+                active={getConfig[configKey]}
+                disabled={
+                  getConfig.mode === "zen" || getConfig.mode === "quote"
+                }
+                onClick={() => {
+                  setConfig(configKey, !getConfig[configKey]);
+                  restartTestEvent.dispatch();
+                }}
+              />
+            )}
+          </For>
+        </div>
+      </AnimeShow>
+    </Anime>
+  );
+}
+
+function Mode(): JSXElement {
+  const modes = [
+    { icon: "fa-clock", mode: "time" },
+    { icon: "fa-font", mode: "words" },
+    { icon: "fa-quote-left", mode: "quote" },
+    { icon: "fa-mountain", mode: "zen" },
+    { icon: "fa-wrench", mode: "custom" },
+  ] as const;
+
+  return (
+    <div class={cn("z-2", cardClass)}>
+      <For each={modes}>
+        {({ icon, mode }) => (
+          <TCButton
+            icon={icon}
+            text={mode}
+            active={getConfig.mode === mode}
+            onClick={() => {
+              setConfig("mode", mode);
+              restartTestEvent.dispatch();
+            }}
+          />
+        )}
+      </For>
+    </div>
+  );
+}
+
+function Mode2(): JSXElement {
+  const [wrapperRef, wrapperElement] = useRefWithUtils();
+  const [timeRef, timeElement] = useRefWithUtils();
+  const [wordsRef, wordsElement] = useRefWithUtils();
+  const [quoteRef, quoteElement] = useRefWithUtils();
+  const [customRef, customElement] = useRefWithUtils();
+
+  const sClass =
+    "z-2 col-start-1 row-start-1 grid w-max place-self-start grid-flow-col ml-(--card-gap)";
+
+  const getElements = () => {
+    const time = timeElement();
+    const words = wordsElement();
+    const quote = quoteElement();
+    const custom = customElement();
+    if (!time || !words || !quote || !custom) return undefined;
+    return { time, words, quote, custom };
+  };
+
+  createEffectOn(
+    () => getConfig.mode,
+    (mode, previousMode) => {
+      const wrapperEl = wrapperElement();
+      const el = getElements();
+      if (!wrapperEl || !el) return;
+
+      type Mode2Key = "time" | "words" | "quote" | "custom";
+      const prev = el[previousMode as Mode2Key];
+      const next = el[mode as Mode2Key];
+
+      if (previousMode === undefined) {
+        for (const e of Object.values(el)) {
+          e.hide();
+        }
+        next?.show();
+        return;
+      }
+
+      prev?.show();
+      const previousWidth = prev?.getOuterWidth() ?? 0;
+
+      next?.show();
+      const newWidth = next?.getOuterWidth() ?? 0;
+
+      void wrapperEl.promiseAnimate({
+        width: [previousWidth + "px", newWidth + "px"],
+        duration: durationMs,
+        onComplete: () => {
+          wrapperEl.setStyle({
+            width: "",
+          });
+        },
+      });
+
+      prev?.show()?.animate({
+        opacity: [1, 0],
+        duration: durationMs,
+        onComplete: () => prev?.hide(),
+      });
+
+      next?.show()?.animate({
+        opacity: [0, 1],
+        duration: durationMs,
+      });
+    },
+  );
+
+  return (
+    <div class="relative grid w-max" ref={wrapperRef}>
+      <Anime
+        class="grid"
+        animation={{
+          opacity: getConfig.mode === "zen" ? 0 : 1,
+          // marginLeft:
+          // getConfig.mode === "zen" ? "calc(-1*var(--card-gap))" : "0",
+          duration: durationMs,
+        }}
+      >
+        <Mode2Time class={cn(cardClass, sClass)} ref={timeRef} />
+        <Mode2Words class={cn(cardClass, sClass)} ref={wordsRef} />
+        <Mode2Quote class={cn(cardClass, sClass)} ref={quoteRef} />
+        <Mode2Custom class={cn(cardClass, sClass)} ref={customRef} />
+      </Anime>
+      <Button
+        variant="text"
+        class={cn(
+          buttonClass,
+          "absolute right-0 self-center px-(--horizontal-padding) opacity-0 transition-[margin-right,background-color,opacity] duration-125 group-hover:mr-[calc((1.25em+(var(--horizontal-padding)*2))*-1)] group-hover:opacity-100 hover:mr-[calc((1.25em+(var(--horizontal-padding)*2))*-1)] hover:opacity-100",
+        )}
+        fa={{ icon: "fa-share", fixedWidth: true }}
+        onClick={() => showModal("ShareTestSettings")}
+      />
+    </div>
+  );
+}
+
+function Mode2Time(props: ComponentProps<"div">): JSXElement {
+  const times = [15, 30, 60, 120] as const;
+
+  return (
+    <div {...props}>
+      <For each={times}>
+        {(time) => (
+          <Button
+            class={buttonClass}
+            variant="text"
+            text={`${time}`}
+            active={getConfig.time === time}
+            onClick={() => {
+              setConfig("time", time);
+              restartTestEvent.dispatch();
+            }}
+          />
+        )}
+      </For>
+      <Button
+        class={buttonClass}
+        variant="text"
+        active={!times.includes(getConfig.time as (typeof times)[number])}
+        fa={{
+          icon: "fa-tools",
+          fixedWidth: true,
+        }}
+        onClick={() => {
+          showModal("TestDuration");
+        }}
+      />
+    </div>
+  );
+}
+
+function Mode2Words(props: ComponentProps<"div">): JSXElement {
+  const wordCounts = [10, 25, 50, 100] as const;
+
+  return (
+    <div {...props}>
+      <For each={wordCounts}>
+        {(count) => (
+          <Button
+            class={buttonClass}
+            variant="text"
+            text={`${count}`}
+            active={getConfig.words === count}
+            onClick={() => {
+              setConfig("words", count);
+              restartTestEvent.dispatch();
+            }}
+          />
+        )}
+      </For>
+      <Button
+        class={buttonClass}
+        variant="text"
+        active={
+          !wordCounts.includes(getConfig.words as (typeof wordCounts)[number])
+        }
+        fa={{
+          icon: "fa-tools",
+          fixedWidth: true,
+        }}
+        onClick={() => {
+          showModal("CustomWordAmount");
+        }}
+      />
+    </div>
+  );
+}
+
+function Mode2Quote(props: ComponentProps<"div">): JSXElement {
+  const quoteLengths = [
+    { text: "short", length: 0 },
+    { text: "medium", length: 1 },
+    { text: "long", length: 2 },
+    { text: "thicc", length: 3 },
+  ] as const;
+
+  return (
+    <div {...props}>
+      <Button
+        class={buttonClass}
+        variant="text"
+        text="all"
+        active={areUnsortedArraysEqual(getConfig.quoteLength, [0, 1, 2, 3])}
+        onClick={() => {
+          setQuoteLengthAll();
+          restartTestEvent.dispatch();
+        }}
+      />
+      <For each={quoteLengths}>
+        {({ text, length }) => (
+          <Button
+            class={buttonClass}
+            variant="text"
+            text={text}
+            active={areUnsortedArraysEqual(getConfig.quoteLength, [length])}
+            onClick={() => {
+              setConfig("quoteLength", [length]);
+              restartTestEvent.dispatch();
+            }}
+          />
+        )}
+      </For>
+      <Show when={isLoggedIn()}>
+        <Button
+          class={buttonClass}
+          fa={{
+            icon: "fa-heart",
+          }}
+          variant="text"
+          active={areUnsortedArraysEqual(getConfig.quoteLength, [-3])}
+          onClick={() => {
+            setConfig("quoteLength", [-3]);
+            restartTestEvent.dispatch();
+          }}
+        />
+      </Show>
+      <Button
+        class={buttonClass}
+        variant="text"
+        fa={{
+          icon: "fa-search",
+          fixedWidth: true,
+        }}
+        onClick={() => {
+          showModal("QuoteSearch");
+        }}
+      />
+    </div>
+  );
+}
+
+function Mode2Custom(props: ComponentProps<"div">): JSXElement {
+  return (
+    <div {...props}>
+      <Button
+        class={buttonClass}
+        variant="text"
+        text="change"
+        onClick={() => {
+          showModal("CustomText");
+        }}
+      />
+    </div>
+  );
+}
diff --git a/frontend/src/ts/components/ui/form/Checkbox.tsx b/frontend/src/ts/components/ui/form/Checkbox.tsx
index c7c89a1f329a..4c357c163fee 100644
--- a/frontend/src/ts/components/ui/form/Checkbox.tsx
+++ b/frontend/src/ts/components/ui/form/Checkbox.tsx
@@ -6,7 +6,7 @@ import { Fa } from "../../common/Fa";
 
 export function Checkbox(props: {
   field: Accessor<AnyFieldApi>;
-  label?: string;
+  label?: string | JSXElement;
   class?: string;
   disabled?: boolean;
 }): JSXElement {
diff --git a/frontend/src/ts/components/ui/form/InputField.tsx b/frontend/src/ts/components/ui/form/InputField.tsx
index 2661d1d83925..8ace7cb934d6 100644
--- a/frontend/src/ts/components/ui/form/InputField.tsx
+++ b/frontend/src/ts/components/ui/form/InputField.tsx
@@ -27,7 +27,6 @@ export function InputField(props: {
           props.showIndicator === true ? "pr-[1.85em]" : "",
           props.class,
         )}
-        id={props.field().name as string}
         type={props.type ?? "text"}
         placeholder={props.placeholder ?? (props.field().name as string)}
         // oxlint-disable-next-line react/no-unknown-property
diff --git a/frontend/src/ts/event-handlers/test.ts b/frontend/src/ts/event-handlers/test.ts
index 108db58ee09c..a55218f6ab3a 100644
--- a/frontend/src/ts/event-handlers/test.ts
+++ b/frontend/src/ts/event-handlers/test.ts
@@ -1,10 +1,7 @@
 import * as Commandline from "../commandline/commandline";
-import * as CustomWordAmount from "../modals/custom-word-amount";
 import { Config } from "../config/store";
 import * as DB from "../db";
 import * as EditResultTagsModal from "../modals/edit-result-tags";
-import * as MobileTestConfigModal from "../modals/mobile-test-config";
-import * as CustomTestDurationModal from "../modals/custom-test-duration";
 import * as TestWords from "../test/test-words";
 import {
   showNoticeNotification,
@@ -15,11 +12,9 @@ import { showQuoteReportModal } from "../states/quote-report";
 import * as PractiseWordsModal from "../modals/practise-words";
 import { navigate } from "../controllers/route-controller";
 import { getMode2 } from "../utils/misc";
-import * as ShareTestSettingsPopup from "../modals/share-test-settings";
 import { ConfigKey } from "@monkeytype/schemas/configs";
 import { ListsObjectKeys } from "../commandline/lists";
 import { qs } from "../utils/dom";
-import { showModal } from "../states/modals";
 
 const testPage = qs(".pageTest");
 
@@ -37,26 +32,6 @@ testPage?.onChild("click", "#testModesNotice .textButton", async (event) => {
   Commandline.show({ commandOverride: attr });
 });
 
-testPage?.onChild("click", "#testConfig .wordCount .textButton", (event) => {
-  const target = event.childTarget as HTMLElement;
-  const wrd = target?.getAttribute("wordCount");
-  if (wrd === "custom") {
-    CustomWordAmount.show();
-  }
-});
-
-testPage?.onChild("click", "#testConfig .time .textButton", (event) => {
-  const target = event.childTarget as HTMLElement;
-  const time = target?.getAttribute("timeconfig");
-  if (time === "custom") {
-    CustomTestDurationModal.show();
-  }
-});
-
-testPage?.onChild("click", "#testConfig .shareButton", () => {
-  ShareTestSettingsPopup.show();
-});
-
 testPage?.onChild("click", ".tags .editTagsButton", () => {
   if ((DB.getSnapshot()?.tags?.length ?? 0) > 0) {
     const resultid =
@@ -71,10 +46,6 @@ testPage?.onChild("click", ".tags .editTagsButton", () => {
   }
 });
 
-testPage?.onChild("click", "#mobileTestConfigButton", () => {
-  MobileTestConfigModal.show();
-});
-
 qs(".pageTest #rateQuoteButton")?.on("click", async () => {
   if (TestWords.currentQuote === null) {
     showErrorNotification("Failed to show quote rating popup: no quote");
@@ -91,18 +62,6 @@ qs(".pageTest #reportQuoteButton")?.on("click", async () => {
   showQuoteReportModal(TestWords.currentQuote?.id);
 });
 
-testPage?.onChild("click", "#testConfig .quoteLength .textButton", (event) => {
-  const target = event.childTarget as HTMLElement;
-  const len = parseInt(target?.getAttribute("quoteLength") ?? "0");
-  if (len === -2) {
-    showModal("QuoteSearch");
-  }
-});
-
-testPage?.onChild("click", "#testConfig .customText .textButton", () => {
-  showModal("CustomText");
-});
-
 testPage?.onChild("click", "#practiseWordsButton", () => {
   if (Config.mode === "zen") {
     showNoticeNotification("Practice words is unsupported in zen mode");
diff --git a/frontend/src/ts/modals/custom-test-duration.ts b/frontend/src/ts/modals/custom-test-duration.ts
deleted file mode 100644
index 16fe8551f931..000000000000
--- a/frontend/src/ts/modals/custom-test-duration.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-import { Config } from "../config/store";
-import { setConfig } from "../config/setters";
-import * as TestLogic from "../test/test-logic";
-import { showNoticeNotification } from "../states/notifications";
-import AnimatedModal, { ShowOptions } from "../utils/animated-modal";
-import { ElementWithUtils } from "../utils/dom";
-
-function parseInput(input: string): number {
-  const re = /((-\s*)?\d+(\.\d+)?\s*[hms]?)/g;
-  const seconds = [...input.toLowerCase().matchAll(re)]
-    .map((match) => {
-      const part = match[0];
-      const duration = parseFloat(part.replace(/\s+/g, ""));
-
-      if (part.includes("h")) {
-        return 3600 * duration;
-      } else if (part.includes("m")) {
-        return 60 * duration;
-      } else {
-        return duration;
-      }
-    })
-    .reduce((total, dur) => total + dur, 0);
-
-  return Math.floor(seconds);
-}
-
-function format(duration: number): string {
-  const hours = Math.floor(duration / 3600);
-  const minutes = Math.floor((duration % 3600) / 60);
-  const seconds = (duration % 3600) % 60;
-
-  const time = [];
-
-  if (hours > 0) {
-    time.push(`${hours} hour${hours === 1 ? "" : "s"}`);
-  }
-
-  if (minutes > 0) {
-    time.push(`${minutes} minute${minutes === 1 ? "" : "s"}`);
-  }
-
-  if (seconds > 0) {
-    time.push(`${seconds} second${seconds === 1 ? "" : "s"}`);
-  }
-
-  if (time.length === 3) {
-    return `${time[0]}, ${time[1]} and ${time[2]}`;
-  } else if (time.length === 2) {
-    return `${time[0]} and ${time[1]}`;
-  } else {
-    return `${time[0]}`;
-  }
-}
-
-function previewDuration(): void {
-  const modalEl = modal.getModal();
-  const input = modalEl.qsr<HTMLInputElement>("input").getValue() as string;
-  const duration = parseInput(input);
-  let formattedDuration = "";
-
-  if (duration < 0) {
-    formattedDuration = "Negative time? Really?";
-  } else if (duration === 0) {
-    formattedDuration = "Infinite test";
-  } else {
-    formattedDuration = format(duration);
-  }
-
-  modalEl.qs(".preview")?.setText(formattedDuration);
-}
-
-export function show(showOptions?: ShowOptions): void {
-  void modal.show({
-    ...showOptions,
-    focusFirstInput: "focusAndSelect",
-    beforeAnimation: async (modalEl) => {
-      modalEl.qs<HTMLInputElement>("input")?.setValue(`${Config.time}`);
-      previewDuration();
-    },
-  });
-}
-
-function hide(clearChain = false): void {
-  void modal.hide({
-    clearModalChain: clearChain,
-  });
-}
-
-function apply(): void {
-  const val = parseInput(
-    modal.getModal().qsr<HTMLInputElement>("input").getValue() as string,
-  );
-
-  if (val !== null && !isNaN(val) && val >= 0 && isFinite(val)) {
-    setConfig("time", val);
-    TestLogic.restart();
-    if (val >= 1800) {
-      showNoticeNotification("Stay safe and take breaks!");
-    } else if (val === 0) {
-      showNoticeNotification(
-        "Infinite time! Make sure to use Bail Out from the command line to save your result.",
-        {
-          durationMs: 7000,
-        },
-      );
-    }
-  } else {
-    showNoticeNotification("Custom time must be a positive number or zero");
-    return;
-  }
-
-  hide(true);
-}
-
-async function setup(modalEl: ElementWithUtils): Promise<void> {
-  modalEl.on("submit", (e) => {
-    e.preventDefault();
-    apply();
-  });
-  modalEl.qs("input")?.on("input", (e) => {
-    previewDuration();
-  });
-}
-
-const modal = new AnimatedModal({
-  dialogId: "customTestDurationModal",
-  setup,
-});
diff --git a/frontend/src/ts/modals/custom-word-amount.ts b/frontend/src/ts/modals/custom-word-amount.ts
deleted file mode 100644
index 6e4fd7aee5ca..000000000000
--- a/frontend/src/ts/modals/custom-word-amount.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { Config } from "../config/store";
-import { setConfig } from "../config/setters";
-import * as TestLogic from "../test/test-logic";
-import { showNoticeNotification } from "../states/notifications";
-import AnimatedModal, { ShowOptions } from "../utils/animated-modal";
-
-export function show(showOptions?: ShowOptions): void {
-  void modal.show({
-    ...showOptions,
-    focusFirstInput: "focusAndSelect",
-    beforeAnimation: async (modalEl) => {
-      modalEl.qs<HTMLInputElement>("input")?.setValue(`${Config.words}`);
-    },
-  });
-}
-
-function hide(clearChain = false): void {
-  void modal.hide({
-    clearModalChain: clearChain,
-  });
-}
-
-function apply(): void {
-  const val = parseInt(
-    modal.getModal().qs<HTMLInputElement>("input")?.getValue() ?? "",
-    10,
-  );
-
-  if (val !== null && !isNaN(val) && val >= 0 && isFinite(val)) {
-    if (setConfig("words", val)) {
-      TestLogic.restart();
-      if (val > 2000) {
-        showNoticeNotification("Stay safe and take breaks!");
-      } else if (val === 0) {
-        showNoticeNotification(
-          "Infinite words! Make sure to use Bail Out from the command line to save your result.",
-          {
-            durationMs: 7000,
-          },
-        );
-      }
-    }
-  } else {
-    showNoticeNotification("Custom word amount must be at least 1");
-  }
-
-  hide(true);
-}
-
-const modal = new AnimatedModal({
-  dialogId: "customWordAmountModal",
-  setup: async (modalEl): Promise<void> => {
-    modalEl.on("submit", (e) => {
-      e.preventDefault();
-      apply();
-    });
-  },
-});
diff --git a/frontend/src/ts/modals/mobile-test-config.ts b/frontend/src/ts/modals/mobile-test-config.ts
deleted file mode 100644
index e88a8cfe7d78..000000000000
--- a/frontend/src/ts/modals/mobile-test-config.ts
+++ /dev/null
@@ -1,173 +0,0 @@
-import * as TestLogic from "../test/test-logic";
-import { Config } from "../config/store";
-import { setConfig, setQuoteLengthAll } from "../config/setters";
-import * as CustomWordAmountPopup from "./custom-word-amount";
-import * as CustomTestDurationPopup from "./custom-test-duration";
-import AnimatedModal from "../utils/animated-modal";
-import { QuoteLength, QuoteLengthConfig } from "@monkeytype/schemas/configs";
-import { Mode } from "@monkeytype/schemas/shared";
-import { areUnsortedArraysEqual } from "../utils/arrays";
-import * as ShareTestSettingsPopup from "./share-test-settings";
-import { ElementWithUtils } from "../utils/dom";
-import { showModal } from "../states/modals";
-
-function update(): void {
-  const el = modal.getModal();
-  el.qsa("button").removeClass("active");
-
-  el.qs(`.modeGroup button[data-mode='${Config.mode}']`)?.addClass("active");
-  el.qs(".timeGroup")?.hide();
-  el.qs(".wordsGroup")?.hide();
-  el.qs(".quoteGroup")?.hide();
-  el.qs(".customGroup")?.hide();
-  el.qs(`.${Config.mode}Group`)?.show();
-
-  if (Config.punctuation) {
-    el.qs(".punctuation")?.addClass("active");
-  } else {
-    el.qs(".punctuation")?.removeClass("active");
-  }
-
-  if (Config.numbers) {
-    el.qs(".numbers")?.addClass("active");
-  } else {
-    el.qs(".numbers")?.removeClass("active");
-  }
-
-  if (Config.mode === "time") {
-    el.qs(`.timeGroup button[data-time='${Config.time}']`)?.addClass("active");
-    el.qs(".punctuation")?.enable();
-    el.qs(".numbers")?.enable();
-  } else if (Config.mode === "words") {
-    el.qs(`.wordsGroup button[data-words='${Config.words}']`)?.addClass(
-      "active",
-    );
-    el.qs(".punctuation")?.enable();
-    el.qs(".numbers")?.enable();
-  } else if (Config.mode === "quote") {
-    if (areUnsortedArraysEqual(Config.quoteLength, [0, 1, 2, 3])) {
-      el.qs(`.quoteGroup button[data-quoteLength='all']`)?.addClass("active");
-    } else {
-      for (const ql of Config.quoteLength) {
-        el.qs(`.quoteGroup button[data-quoteLength='${ql}']`)?.addClass(
-          "active",
-        );
-      }
-    }
-    el.qs(".punctuation")?.disable();
-    el.qs(".numbers")?.disable();
-  } else if (Config.mode === "zen") {
-    el.qs(".punctuation")?.disable();
-    el.qs(".numbers")?.disable();
-  } else if (Config.mode === "custom") {
-    el.qs(".punctuation")?.enable();
-    el.qs(".numbers")?.enable();
-  }
-}
-
-export function show(): void {
-  void modal.show({
-    beforeAnimation: async () => {
-      update();
-    },
-  });
-}
-
-// function hide(): void {
-//   void modal.hide();
-// }
-
-async function setup(modalEl: ElementWithUtils): Promise<void> {
-  modalEl.qsa(".wordsGroup button").on("click", (e) => {
-    const target = e.currentTarget as HTMLElement;
-    const wrd = target.getAttribute("data-words") as string;
-
-    if (wrd === "custom") {
-      CustomWordAmountPopup.show({
-        modalChain: modal,
-      });
-    } else if (wrd !== undefined) {
-      const wrdNum = parseInt(wrd);
-      setConfig("words", wrdNum);
-      TestLogic.restart();
-    }
-  });
-
-  modalEl.qsa(".modeGroup button").on("click", (e) => {
-    const target = e.currentTarget as HTMLElement;
-    const mode = target.getAttribute("data-mode");
-    if (mode === Config.mode) return;
-    setConfig("mode", mode as Mode);
-    TestLogic.restart();
-  });
-
-  modalEl.qsa(".timeGroup button").on("click", (e) => {
-    const target = e.currentTarget as HTMLElement;
-    const time = target.getAttribute("data-time") as string;
-
-    if (time === "custom") {
-      CustomTestDurationPopup.show({
-        modalChain: modal,
-      });
-    } else if (time !== undefined) {
-      const timeNum = parseInt(time);
-      setConfig("time", timeNum);
-      TestLogic.restart();
-    }
-  });
-
-  modalEl.qsa(".quoteGroup button").on("click", (e) => {
-    const target = e.currentTarget as HTMLElement;
-    const lenAttr = target.getAttribute("data-quoteLength") ?? "0";
-
-    if (lenAttr === "all") {
-      if (setQuoteLengthAll()) {
-        TestLogic.restart();
-      }
-    } else if (lenAttr === "-2") {
-      showModal("QuoteSearch");
-    } else {
-      const len = parseInt(lenAttr, 10) as QuoteLength;
-      let arr: QuoteLengthConfig = [];
-
-      if ((e as MouseEvent).shiftKey) {
-        arr = [...Config.quoteLength, len];
-      } else {
-        arr = [len];
-      }
-
-      if (setConfig("quoteLength", arr)) {
-        TestLogic.restart();
-      }
-    }
-  });
-
-  modalEl.qs(".customChange")?.on("click", () => {
-    showModal("CustomText");
-  });
-
-  modalEl.qs(".punctuation")?.on("click", () => {
-    setConfig("punctuation", !Config.punctuation);
-    TestLogic.restart();
-  });
-
-  modalEl.qs(".numbers")?.on("click", () => {
-    setConfig("numbers", !Config.numbers);
-    TestLogic.restart();
-  });
-
-  modalEl.qs(".shareButton")?.on("click", () => {
-    ShareTestSettingsPopup.show({
-      modalChain: modal,
-    });
-  });
-
-  modalEl.qsa("button").on("click", () => {
-    update();
-  });
-}
-
-const modal = new AnimatedModal({
-  dialogId: "mobileTestConfigModal",
-  setup,
-});
diff --git a/frontend/src/ts/modals/share-test-settings.ts b/frontend/src/ts/modals/share-test-settings.ts
deleted file mode 100644
index 86d3324a9ca4..000000000000
--- a/frontend/src/ts/modals/share-test-settings.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-import { Config } from "../config/store";
-import { currentQuote } from "../test/test-words";
-import { getMode2 } from "../utils/misc";
-import * as CustomText from "../test/custom-text";
-import { compressToURI } from "lz-ts";
-import AnimatedModal, { ShowOptions } from "../utils/animated-modal";
-import { Difficulty, FunboxName } from "@monkeytype/schemas/configs";
-import { Mode, Mode2 } from "@monkeytype/schemas/shared";
-import { ElementWithUtils } from "../utils/dom";
-import { CustomTextSettings } from "@monkeytype/schemas/results";
-
-function getCheckboxValue(checkbox: string): boolean {
-  return modal
-    .getModal()
-    .qsr<HTMLInputElement>(`label.${checkbox} input`)
-    .isChecked() as boolean;
-}
-
-type SharedTestSettings = [
-  Mode | null,
-  Mode2<Mode> | null,
-  CustomTextSettings | null,
-  boolean | null,
-  boolean | null,
-  string | null,
-  Difficulty | null,
-  FunboxName[] | null,
-];
-
-function updateURL(): void {
-  const baseUrl = location.origin + "?testSettings=";
-  const settings: SharedTestSettings = new Array(8).fill(
-    null,
-  ) as SharedTestSettings;
-
-  const settingsMap = [
-    { key: "mode", getValue: () => Config.mode },
-    { key: "mode2", getValue: () => getMode2(Config, currentQuote) },
-    { key: "customText", getValue: () => CustomText.getData() },
-    { key: "punctuation", getValue: () => Config.punctuation },
-    { key: "numbers", getValue: () => Config.numbers },
-    { key: "language", getValue: () => Config.language },
-    { key: "difficulty", getValue: () => Config.difficulty },
-    { key: "funbox", getValue: () => Config.funbox },
-  ];
-
-  for (const [index, { key, getValue }] of settingsMap.entries()) {
-    if (getCheckboxValue(key)) {
-      settings[index] = getValue();
-    }
-  }
-
-  const compressed = compressToURI(JSON.stringify(settings));
-  const url = baseUrl + compressed;
-
-  updateShareModal(url);
-}
-
-function updateShareModal(url: string): void {
-  const modalEl = modal.getModal();
-  modalEl.qsr<HTMLTextAreaElement>("textarea.url").setValue(url);
-  modalEl.qsr(".tooLongWarning").toggleClass("hidden", url.length <= 2000);
-}
-
-function updateSubgroups(): void {
-  const modalEl = modal.getModal();
-  if (getCheckboxValue("mode")) {
-    modalEl.qsa(".subgroup").show();
-  } else {
-    modalEl.qsa(".subgroup").hide();
-  }
-}
-
-export function show(showOptions?: ShowOptions): void {
-  void modal.show({
-    ...showOptions,
-    beforeAnimation: async () => {
-      updateURL();
-      updateSubgroups();
-    },
-  });
-}
-
-async function setup(modalEl: ElementWithUtils): Promise<void> {
-  modalEl.qs("textarea.url")?.on("click", async (e) => {
-    (e.target as HTMLTextAreaElement).select();
-  });
-
-  modalEl.qsa("label input").on("change", async () => {
-    updateURL();
-    updateSubgroups();
-  });
-}
-
-const modal = new AnimatedModal({
-  dialogId: "shareTestSettingsModal",
-  setup,
-});
diff --git a/frontend/src/ts/pages/test.ts b/frontend/src/ts/pages/test.ts
index fde5843701af..3abbf34aab78 100644
--- a/frontend/src/ts/pages/test.ts
+++ b/frontend/src/ts/pages/test.ts
@@ -5,7 +5,6 @@ import Page from "./page";
 import { updateFooterAndVerticalAds } from "../controllers/ad-controller";
 import * as ModesNotice from "../elements/modes-notice";
 import * as Keymap from "../elements/keymap";
-import * as TestConfig from "../test/test-config";
 import { blurInputElement } from "../input/input-element";
 import { qsr } from "../utils/dom";
 
@@ -30,7 +29,6 @@ export const page = new Page({
     TestLogic.restart({
       noAnim: true,
     });
-    void TestConfig.instantUpdate();
     void Keymap.refresh();
   },
 });
diff --git a/frontend/src/ts/states/core.ts b/frontend/src/ts/states/core.ts
index 00695db0a8cc..2fefee6fe99a 100644
--- a/frontend/src/ts/states/core.ts
+++ b/frontend/src/ts/states/core.ts
@@ -37,5 +37,7 @@ export const isLoggedIn = (): boolean => getUserId() !== null;
 export const [getSelectedProfileName, setSelectedProfileName] = createSignal<
   string | undefined
 >(undefined);
+export const [getResultVisible, setResultVisible] =
+  createSignal<boolean>(false);
 
 export const restartTestEvent = createEvent();
diff --git a/frontend/src/ts/states/modals.ts b/frontend/src/ts/states/modals.ts
index 42ac0e8b9f52..fa2fac25505e 100644
--- a/frontend/src/ts/states/modals.ts
+++ b/frontend/src/ts/states/modals.ts
@@ -19,7 +19,11 @@ export type ModalId =
   | "QuoteRate"
   | "QuoteReport"
   | "QuoteSubmit"
-  | "QuoteApprove";
+  | "QuoteApprove"
+  | "TestDuration"
+  | "ShareTestSettings"
+  | "CustomWordAmount"
+  | "MobileTestConfig";
 
 export type ModalVisibility = {
   visible: boolean;
diff --git a/frontend/src/ts/test/result.ts b/frontend/src/ts/test/result.ts
index bf43b7f27262..e83ec0146878 100644
--- a/frontend/src/ts/test/result.ts
+++ b/frontend/src/ts/test/result.ts
@@ -26,7 +26,6 @@ import * as Numbers from "@monkeytype/util/numbers";
 import * as Arrays from "../utils/arrays";
 import { get as getTypingSpeedUnit } from "../utils/typing-speed-units";
 import * as PbCrown from "./pb-crown";
-import * as TestConfig from "./test-config";
 import * as TestInput from "./test-input";
 import * as TestStats from "./test-stats";
 import * as TestUI from "./test-ui";
@@ -1091,7 +1090,6 @@ export async function update(
     });
   }
 
-  TestConfig.hide();
   Focus.set(false);
 
   const canQuickRestart = canQuickRestartFn(
diff --git a/frontend/src/ts/test/test-config.ts b/frontend/src/ts/test/test-config.ts
deleted file mode 100644
index ccfca5ef1552..000000000000
--- a/frontend/src/ts/test/test-config.ts
+++ /dev/null
@@ -1,352 +0,0 @@
-import { ConfigValue, QuoteLength } from "@monkeytype/schemas/configs";
-import { Mode } from "@monkeytype/schemas/shared";
-import { Config } from "../config/store";
-import { configEvent } from "../events/config";
-import { getActivePage } from "../states/core";
-import { applyReducedMotion } from "../utils/misc";
-import { areUnsortedArraysEqual } from "../utils/arrays";
-import { authEvent } from "../events/auth";
-import { qs, qsa } from "../utils/dom";
-
-export function show(): void {
-  qs("#testConfig")?.removeClass("invisible");
-  qs("#mobileTestConfigButton")?.removeClass("invisible");
-}
-
-export function hide(): void {
-  qs("#testConfig")?.addClass("invisible");
-  qs("#mobileTestConfigButton")?.addClass("invisible");
-}
-
-export async function instantUpdate(): Promise<void> {
-  qsa("#testConfig .mode .textButton")?.removeClass("active");
-  qs("#testConfig .mode .textButton[mode='" + Config.mode + "']")?.addClass(
-    "active",
-  );
-
-  qs("#testConfig .puncAndNum")?.hide();
-  qsa("#testConfig .spacer")?.hide();
-  qs("#testConfig .time")?.hide();
-  qs("#testConfig .wordCount")?.hide();
-  qs("#testConfig .customText")?.hide();
-  qs("#testConfig .quoteLength")?.hide();
-  qs("#testConfig .zen")?.hide();
-
-  if (Config.mode === "time") {
-    qs("#testConfig .puncAndNum")?.show()?.setStyle({
-      width: "",
-      opacity: "",
-    });
-    qs("#testConfig .leftSpacer")?.show();
-    qs("#testConfig .rightSpacer")?.show();
-    qs("#testConfig .time")?.show();
-
-    updateActiveExtraButtons("time", Config.time);
-  } else if (Config.mode === "words") {
-    qs("#testConfig .puncAndNum")?.show()?.setStyle({
-      width: "",
-      opacity: "",
-    });
-    qs("#testConfig .leftSpacer")?.show();
-    qs("#testConfig .rightSpacer")?.show();
-    qs("#testConfig .wordCount")?.show();
-
-    updateActiveExtraButtons("words", Config.words);
-  } else if (Config.mode === "quote") {
-    qs("#testConfig .rightSpacer")?.show();
-    qs("#testConfig .quoteLength")?.show();
-
-    updateActiveExtraButtons("quoteLength", Config.quoteLength);
-  } else if (Config.mode === "custom") {
-    qs("#testConfig .puncAndNum")?.show()?.setStyle({
-      width: "",
-      opacity: "",
-    });
-    qs("#testConfig .leftSpacer")?.show();
-    qs("#testConfig .rightSpacer")?.show();
-    qs("#testConfig .customText")?.show();
-  }
-
-  updateActiveExtraButtons("numbers", Config.numbers);
-  updateActiveExtraButtons("punctuation", Config.punctuation);
-}
-
-async function update(previous: Mode, current: Mode): Promise<void> {
-  if (previous === current) return;
-  updateActiveModeButtons(current);
-
-  if (current === "time") {
-    updateActiveExtraButtons("time", Config.time);
-  } else if (current === "words") {
-    updateActiveExtraButtons("words", Config.words);
-  } else if (current === "quote") {
-    updateActiveExtraButtons("quoteLength", Config.quoteLength);
-  }
-
-  const submenu = {
-    time: "time",
-    words: "wordCount",
-    custom: "customText",
-    quote: "quoteLength",
-    zen: "zen",
-  };
-
-  const animTime = applyReducedMotion(250);
-
-  const scale = 2;
-  const easing = {
-    both: `inOut(${scale})`,
-    in: `in(${scale})`,
-    out: `out(${scale})`,
-  };
-
-  const puncAndNumVisible = {
-    time: true,
-    words: true,
-    custom: true,
-    quote: false,
-    zen: false,
-  };
-
-  const puncAndNumEl = qs("#testConfig .puncAndNum");
-
-  if (puncAndNumVisible[current] !== puncAndNumVisible[previous]) {
-    puncAndNumEl
-      ?.setStyle({
-        width: "unset",
-        opacity: "1",
-      })
-      ?.show();
-
-    const width = Math.round(
-      puncAndNumEl?.native.getBoundingClientRect().width ?? 0,
-    );
-
-    puncAndNumEl?.animate({
-      width: [
-        (puncAndNumVisible[previous] ? width : 0) + "px",
-        (puncAndNumVisible[current] ? width : 0) + "px",
-      ],
-      opacity: {
-        duration: animTime / 2,
-        delay: puncAndNumVisible[current] ? animTime / 2 : 0,
-        from: puncAndNumVisible[previous] ? 1 : 0,
-        to: puncAndNumVisible[current] ? 1 : 0,
-      },
-      duration: animTime,
-      ease: easing.both,
-      onComplete: () => {
-        if (puncAndNumVisible[current]) {
-          puncAndNumEl?.setStyle({ width: "unset" });
-        } else {
-          puncAndNumEl?.hide();
-        }
-      },
-    });
-
-    const leftSpacerEl = qs("#testConfig .leftSpacer");
-
-    leftSpacerEl?.setStyle({ width: "0.5em" });
-    leftSpacerEl?.setStyle({ opacity: "1" });
-    leftSpacerEl?.show();
-
-    leftSpacerEl?.animate({
-      width: [
-        puncAndNumVisible[previous] ? "0.5em" : 0,
-        puncAndNumVisible[current] ? "0.5em" : 0,
-      ],
-      // opacity: {
-      //   duration: animTime / 2,
-      //   // delay: puncAndNumVisible[current] ? animTime / 2 : 0,
-      //   from: puncAndNumVisible[previous] ? 1 : 0,
-      //   to: puncAndNumVisible[current] ? 1 : 0,
-      // },
-      duration: animTime,
-      ease: easing.both,
-      onComplete: () => {
-        if (puncAndNumVisible[current]) {
-          leftSpacerEl?.setStyle({ width: "" });
-        } else {
-          leftSpacerEl?.hide();
-        }
-      },
-    });
-  }
-
-  const rightSpacerEl = qs("#testConfig .rightSpacer");
-
-  rightSpacerEl?.setStyle({ width: "0.5em" });
-  rightSpacerEl?.setStyle({ opacity: "1" });
-  rightSpacerEl?.show();
-
-  rightSpacerEl?.animate({
-    width: [
-      previous === "zen" ? "0px" : "0.5em",
-      current === "zen" ? "0px" : "0.5em",
-    ],
-    // opacity: {
-    //   duration: animTime / 2,
-    //   from: previous === "zen" ? 0 : 1,
-    //   to: current === "zen" ? 0 : 1,
-    // },
-    duration: animTime,
-    ease: easing.both,
-    onComplete: () => {
-      if (current === "zen") {
-        rightSpacerEl?.hide();
-      } else {
-        rightSpacerEl?.setStyle({ width: "" });
-      }
-    },
-  });
-
-  const currentEl = qs(`#testConfig .${submenu[current]}`);
-  const previousEl = qs(`#testConfig .${submenu[previous]}`);
-
-  const previousWidth = Math.round(
-    previousEl?.native.getBoundingClientRect().width ?? 0,
-  );
-
-  previousEl?.hide();
-  currentEl?.show();
-
-  const currentWidth = Math.round(
-    currentEl?.native.getBoundingClientRect().width ?? 0,
-  );
-
-  previousEl?.show();
-  currentEl?.hide();
-
-  const widthDifference = currentWidth - previousWidth;
-  const widthStep = widthDifference / 2;
-
-  await previousEl?.promiseAnimate({
-    opacity: [1, 0],
-    width: [previousWidth + "px", previousWidth + widthStep + "px"],
-    duration: animTime / 2,
-    ease: easing.in,
-  });
-
-  previousEl
-    ?.setStyle({
-      opacity: "1",
-      width: "unset",
-    })
-    ?.hide();
-  currentEl
-    ?.setStyle({
-      opacity: "0",
-      width: previousWidth + widthStep + "px",
-    })
-    ?.show();
-
-  await currentEl?.promiseAnimate({
-    opacity: [0, 1],
-    width: [previousWidth + widthStep + "px", currentWidth + "px"],
-    duration: animTime / 2,
-    ease: easing.out,
-  });
-
-  currentEl?.setStyle({ width: "" });
-}
-
-function updateActiveModeButtons(mode: Mode): void {
-  qsa("#testConfig .mode .textButton")?.removeClass("active");
-  qs("#testConfig .mode .textButton[mode='" + mode + "']")?.addClass("active");
-}
-
-function updateActiveExtraButtons(key: string, value: ConfigValue): void {
-  if (key === "time") {
-    qsa("#testConfig .time .textButton")?.removeClass("active");
-    const timeCustom = ![15, 30, 60, 120].includes(value as number)
-      ? "custom"
-      : (value as number);
-    qs(
-      "#testConfig .time .textButton[timeConfig='" + timeCustom + "']",
-    )?.addClass("active");
-  } else if (key === "words") {
-    qsa("#testConfig .wordCount .textButton")?.removeClass("active");
-
-    const wordCustom = ![10, 25, 50, 100, 200].includes(value as number)
-      ? "custom"
-      : (value as number);
-
-    qs(
-      "#testConfig .wordCount .textButton[wordCount='" + wordCustom + "']",
-    )?.addClass("active");
-  } else if (key === "quoteLength") {
-    qsa("#testConfig .quoteLength .textButton")?.removeClass("active");
-
-    if (areUnsortedArraysEqual(value as QuoteLength[], [0, 1, 2, 3])) {
-      qs("#testConfig .quoteLength .textButton[quotelength='all']")?.addClass(
-        "active",
-      );
-    } else {
-      (value as QuoteLength[]).forEach((ql) => {
-        qs(
-          "#testConfig .quoteLength .textButton[quoteLength='" + ql + "']",
-        )?.addClass("active");
-      });
-    }
-  } else if (key === "numbers") {
-    if (value === false) {
-      qs("#testConfig .numbersMode.textButton")?.removeClass("active");
-    } else {
-      qs("#testConfig .numbersMode.textButton")?.addClass("active");
-    }
-  } else if (key === "punctuation") {
-    if (value === false) {
-      qs("#testConfig .punctuationMode.textButton")?.removeClass("active");
-    } else {
-      qs("#testConfig .punctuationMode.textButton")?.addClass("active");
-    }
-  }
-}
-
-export function showFavoriteQuoteLength(): void {
-  qs("#testConfig .quoteLength .favorite")?.show();
-}
-
-export function hideFavoriteQuoteLength(): void {
-  qs("#testConfig .quoteLength .favorite")?.hide();
-}
-
-let ignoreConfigEvent = false;
-
-configEvent.subscribe(({ key, newValue, previousValue }) => {
-  if (key === "fullConfigChange") {
-    ignoreConfigEvent = true;
-  }
-  if (key === "fullConfigChangeFinished") {
-    ignoreConfigEvent = false;
-
-    void instantUpdate();
-  }
-
-  // this is here to prevent calling set / preview multiple times during a full config loading
-  // once the full config is loaded, we can apply everything once
-  if (ignoreConfigEvent) return;
-
-  if (getActivePage() !== "test") return;
-  if (key === "mode") {
-    void update(previousValue, newValue);
-  } else if (
-    ["time", "quoteLength", "words", "numbers", "punctuation"].includes(
-      key ?? "",
-    )
-  ) {
-    if (newValue !== undefined) {
-      updateActiveExtraButtons(key, newValue);
-    }
-  }
-});
-
-authEvent.subscribe((event) => {
-  if (event.type === "authStateChanged") {
-    if (!event.data.isUserSignedIn) {
-      hideFavoriteQuoteLength();
-    } else {
-      showFavoriteQuoteLength();
-    }
-  }
-});
diff --git a/frontend/src/ts/test/test-logic.ts b/frontend/src/ts/test/test-logic.ts
index 3ac6d4394b51..8370c8595c81 100644
--- a/frontend/src/ts/test/test-logic.ts
+++ b/frontend/src/ts/test/test-logic.ts
@@ -26,7 +26,11 @@ import * as TodayTracker from "./today-tracker";
 import * as ChallengeContoller from "../controllers/challenge-controller";
 import { clearQuoteStats } from "../states/quote-rate";
 import * as Result from "./result";
-import { getActivePage, restartTestEvent } from "../states/core";
+import {
+  getActivePage,
+  restartTestEvent,
+  setResultVisible,
+} from "../states/core";
 import * as TestInput from "./test-input";
 import * as TestWords from "./test-words";
 import * as WordsGenerator from "./words-generator";
@@ -41,7 +45,6 @@ import * as ConnectionState from "../legacy-states/connection";
 import { highlight } from "../events/keymap";
 import * as LazyModeState from "../legacy-states/remember-lazy-mode";
 import Format from "../singletons/format";
-import { QuoteLength, QuoteLengthConfig } from "@monkeytype/schemas/configs";
 import { Mode } from "@monkeytype/schemas/shared";
 import {
   CompletedEvent,
@@ -330,6 +333,7 @@ export function restart(options = {} as RestartOptions): void {
     opacity: 0,
     duration: animationTime,
     onComplete: async () => {
+      setResultVisible(false);
       setInputElementValue("");
 
       await Funbox.rememberSettings();
@@ -915,6 +919,7 @@ export async function finish(difficultyFailed = false): Promise<void> {
     TestStats.setEnd(TestInput.keypressTimings.spacing.last);
   }
 
+  setResultVisible(true);
   TestState.setResultVisible(true);
   TestState.setActive(false);
   Replay.stopReplayRecording();
@@ -1435,86 +1440,6 @@ qs(".pageTest")?.onChild("click", "#restartTestButtonWithSameWordset", () => {
 
 restartTestEvent.subscribe(() => restart());
 
-qs(".pageTest")?.onChild("click", "#testConfig .mode .textButton", (e) => {
-  if (TestState.testRestarting) return;
-  if ((e.childTarget as HTMLElement).classList.contains("active")) return;
-  const mode = ((e.childTarget as HTMLElement)?.getAttribute("mode") ??
-    "time") as Mode;
-  if (mode === undefined) return;
-  if (setConfig("mode", mode)) {
-    restart();
-  }
-});
-
-qs(".pageTest")?.onChild("click", "#testConfig .wordCount .textButton", (e) => {
-  if (TestState.testRestarting) return;
-  const wrd = (e.childTarget as HTMLElement)?.getAttribute("wordCount") ?? "15";
-  if (wrd !== "custom") {
-    if (setConfig("words", parseInt(wrd))) {
-      restart();
-    }
-  }
-});
-
-qs(".pageTest")?.onChild("click", "#testConfig .time .textButton", (e) => {
-  if (TestState.testRestarting) return;
-  const mode =
-    (e.childTarget as HTMLElement)?.getAttribute("timeConfig") ?? "10";
-  if (mode !== "custom") {
-    if (setConfig("time", parseInt(mode))) {
-      restart();
-    }
-  }
-});
-
-qs(".pageTest")?.onChild(
-  "click",
-  "#testConfig .quoteLength .textButton",
-  (e) => {
-    if (TestState.testRestarting) return;
-    const lenAttr = (e.childTarget as HTMLElement)?.getAttribute("quoteLength");
-    if (lenAttr === "all") {
-      if (setQuoteLengthAll()) {
-        restart();
-      }
-    } else {
-      const len = parseInt(lenAttr ?? "1") as QuoteLength;
-
-      if (len !== -2) {
-        let arr: QuoteLengthConfig = [];
-
-        if (e.shiftKey) {
-          arr = [...Config.quoteLength, len];
-        } else {
-          arr = [len];
-        }
-
-        if (setConfig("quoteLength", arr)) {
-          restart();
-        }
-      }
-    }
-  },
-);
-
-qs(".pageTest")?.onChild(
-  "click",
-  "#testConfig .punctuationMode.textButton",
-  () => {
-    if (TestState.testRestarting) return;
-    if (setConfig("punctuation", !Config.punctuation)) {
-      restart();
-    }
-  },
-);
-
-qs(".pageTest")?.onChild("click", "#testConfig .numbersMode.textButton", () => {
-  if (TestState.testRestarting) return;
-  if (setConfig("numbers", !Config.numbers)) {
-    restart();
-  }
-});
-
 // ===============================
 
 configEvent.subscribe(({ key, newValue, nosave }) => {
diff --git a/frontend/src/ts/test/test-screenshot.ts b/frontend/src/ts/test/test-screenshot.ts
index 3232c0c708f1..5487a16c0494 100644
--- a/frontend/src/ts/test/test-screenshot.ts
+++ b/frontend/src/ts/test/test-screenshot.ts
@@ -25,7 +25,6 @@ function revert(): void {
   hideLoaderBar();
   qs("#ad-result-wrapper")?.show();
   qs("#ad-result-small-wrapper")?.show();
-  qs("#testConfig")?.show();
   qs(".pageTest .screenshotSpacer")?.remove();
   qs(".pageTest .ssWatermark")?.hide();
   qs(".pageTest .ssWatermark")?.setText("monkeytype.com"); // Reset watermark text
@@ -94,7 +93,6 @@ async function generateCanvas(): Promise<HTMLCanvasElement | null> {
   qs("#nocss")?.hide();
   qs("#ad-result-wrapper")?.hide();
   qs("#ad-result-small-wrapper")?.hide();
-  qs("#testConfig")?.hide();
   // Ensure spacer is removed before adding a new one if function is called rapidly
   qs(".pageTest .screenshotSpacer")?.remove();
   qs(".page.pageTest")?.prependHtml("<div class='screenshotSpacer'></div>");
diff --git a/frontend/src/ts/test/test-ui.ts b/frontend/src/ts/test/test-ui.ts
index 5bd1f63d7463..730f65311bc6 100644
--- a/frontend/src/ts/test/test-ui.ts
+++ b/frontend/src/ts/test/test-ui.ts
@@ -50,7 +50,6 @@ import {
 } from "../input/input-element";
 import * as MonkeyPower from "../elements/monkey-power";
 import * as SlowTimer from "../legacy-states/slow-timer";
-import * as TestConfig from "./test-config";
 import * as CompositionDisplay from "../elements/composition-display";
 import * as AdController from "../controllers/ad-controller";
 import * as Ligatures from "./break-ligatures";
@@ -1887,7 +1886,6 @@ export function onTestRestart(source: "testPage" | "resultPage"): void {
   qs("#result")?.hide();
   qs("#typingTest")?.setStyle({ opacity: "0" }).show();
   getInputElement().style.left = "0";
-  TestConfig.show();
   Focus.set(false);
   LiveSpeed.instantHide();
   LiveSpeed.reset();
diff --git a/frontend/static/funbox/crt.css b/frontend/static/funbox/crt.css
index 6e4c309059cf..1413c4f9f024 100644
--- a/frontend/static/funbox/crt.css
+++ b/frontend/static/funbox/crt.css
@@ -63,12 +63,10 @@ body.crtmode #bannerCenter .banner {
     0 0 3px;
 }
 
-body.crtmode #testConfig,
 body.crtmode #testModesNotice {
   text-shadow: none;
 }
 
-body.crtmode #testConfig .textButton,
 body.crtmode #testModesNotice .textButton {
   text-shadow:
     3px 0 1px var(--crt-sub-color-glow),
@@ -76,7 +74,6 @@ body.crtmode #testModesNotice .textButton {
     0 0 3px;
 }
 
-body.crtmode #testConfig .textButton:hover,
 body.crtmode #testModesNotice .textButton:hover {
   text-shadow:
     3px 0 1px var(--crt-text-color-glow),
@@ -84,7 +81,6 @@ body.crtmode #testModesNotice .textButton:hover {
     0 0 3px;
 }
 
-body.crtmode #testConfig .textButton.active,
 body.crtmode #testModesNotice .textButton.active {
   text-shadow:
     3px 0 1px var(--crt-main-color-glow),
@@ -92,7 +88,6 @@ body.crtmode #testModesNotice .textButton.active {
     0 0 3px;
 }
 
-body.crtmode #testConfig .row,
 body.crtmode #testModesNotice .row {
   box-shadow:
     3px 0 1px var(--crt-sub-alt-color-glow),
diff --git a/frontend/static/themes/dark_note.css b/frontend/static/themes/dark_note.css
index e9dd63b4e40e..47c9483c1370 100644
--- a/frontend/static/themes/dark_note.css
+++ b/frontend/static/themes/dark_note.css
@@ -12,7 +12,7 @@
 
 button:not(.accountButtonAndMenu *),
 .button:not(.accountButtonAndMenu *),
-#testConfig .row {
+[data-ui-element="testConfig"] {
   --roundness: 5em; /* overwriting default roundness to make it softer */
 }
 
diff --git a/frontend/static/themes/phantom.css b/frontend/static/themes/phantom.css
index f26a15c0ac80..836581a2d716 100644
--- a/frontend/static/themes/phantom.css
+++ b/frontend/static/themes/phantom.css
@@ -124,8 +124,9 @@ footer button:hover {
   background: none;
 }
 
-#testConfig button:hover {
+[data-ui-element="testConfig"] button:hover {
   background: none;
+  animation: phantom-glow 3s linear infinite;
 }
 
 .afk,
diff --git a/frontend/storybook/.storybook/preview.ts b/frontend/storybook/.storybook/preview.ts
index f464c39896f5..87640ec0f53b 100644
--- a/frontend/storybook/.storybook/preview.ts
+++ b/frontend/storybook/.storybook/preview.ts
@@ -6,6 +6,7 @@ import "../stories/tailwind.css";
 import "../stories/storybook-theme.css";
 import "@fortawesome/fontawesome-free/css/all.min.css";
 import "balloon-css/balloon.min.css";
+//@ts-expect-error this works i think
 import "slim-select/styles";
 
 import { ThemesList } from "../../src/ts/constants/themes";
diff --git a/frontend/storybook/package.json b/frontend/storybook/package.json
index 1c1a1ebd8ad5..00666bef0dbd 100644
--- a/frontend/storybook/package.json
+++ b/frontend/storybook/package.json
@@ -13,6 +13,9 @@
     "storybook": "storybook dev -p 6006",
     "build-storybook": "storybook build"
   },
+  "dependencies": {
+    "slim-select": "2.9.2"
+  },
   "devDependencies": {
     "@chromatic-com/storybook": "^5.0.1",
     "@storybook/addon-a11y": "^10.2.14",
diff --git a/package.json b/package.json
index baafef1b2fd3..45a9bab2499c 100644
--- a/package.json
+++ b/package.json
@@ -68,9 +68,9 @@
     "knip": "2.19.2",
     "lint-staged": "13.2.3",
     "only-allow": "1.2.1",
-    "oxfmt": "0.35.0",
-    "oxlint": "1.50.0",
-    "oxlint-tsgolint": "0.14.2",
+    "oxfmt": "0.42.0",
+    "oxlint": "1.57.0",
+    "oxlint-tsgolint": "0.17.3",
     "prettier": "3.7.1",
     "turbo": "2.7.5",
     "vitest": "4.1.0"
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index 2d1d20b1c587..e7d95e4eac01 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -29,10 +29,10 @@
     "@monkeytype/tsup-config": "workspace:*",
     "@monkeytype/typescript-config": "workspace:*",
     "madge": "8.0.0",
-    "oxlint": "1.50.0",
-    "oxlint-tsgolint": "0.14.2",
+    "oxlint": "1.57.0",
+    "oxlint-tsgolint": "0.17.3",
     "tsup": "8.4.0",
-    "typescript": "6.0.0-beta",
+    "typescript": "6.0.2",
     "vitest": "4.1.0"
   },
   "peerDependencies": {
diff --git a/packages/funbox/package.json b/packages/funbox/package.json
index 99950a06fcf7..94c8df162bf2 100644
--- a/packages/funbox/package.json
+++ b/packages/funbox/package.json
@@ -25,10 +25,10 @@
     "@monkeytype/tsup-config": "workspace:*",
     "@monkeytype/typescript-config": "workspace:*",
     "madge": "8.0.0",
-    "oxlint": "1.50.0",
-    "oxlint-tsgolint": "0.14.2",
+    "oxlint": "1.57.0",
+    "oxlint-tsgolint": "0.17.3",
     "tsup": "8.4.0",
-    "typescript": "6.0.0-beta",
+    "typescript": "6.0.2",
     "vitest": "4.1.0"
   }
 }
diff --git a/packages/release/package.json b/packages/release/package.json
index 092707e26c3f..0af5879cb9a9 100644
--- a/packages/release/package.json
+++ b/packages/release/package.json
@@ -20,7 +20,7 @@
   },
   "devDependencies": {
     "nodemon": "3.1.14",
-    "oxlint": "1.50.0",
-    "oxlint-tsgolint": "0.14.2"
+    "oxlint": "1.57.0",
+    "oxlint-tsgolint": "0.17.3"
   }
 }
diff --git a/packages/schemas/package.json b/packages/schemas/package.json
index d56506f82d98..92558b389261 100644
--- a/packages/schemas/package.json
+++ b/packages/schemas/package.json
@@ -26,10 +26,10 @@
     "@monkeytype/tsup-config": "workspace:*",
     "@monkeytype/typescript-config": "workspace:*",
     "madge": "8.0.0",
-    "oxlint": "1.50.0",
-    "oxlint-tsgolint": "0.14.2",
+    "oxlint": "1.57.0",
+    "oxlint-tsgolint": "0.17.3",
     "tsup": "8.4.0",
-    "typescript": "6.0.0-beta",
+    "typescript": "6.0.2",
     "vitest": "4.1.0"
   },
   "peerDependencies": {
diff --git a/packages/tsup-config/package.json b/packages/tsup-config/package.json
index c94a6c0d4fec..6f5145109ebd 100644
--- a/packages/tsup-config/package.json
+++ b/packages/tsup-config/package.json
@@ -17,9 +17,9 @@
   },
   "devDependencies": {
     "@monkeytype/typescript-config": "workspace:*",
-    "oxlint": "1.50.0",
-    "oxlint-tsgolint": "0.14.2",
-    "typescript": "6.0.0-beta"
+    "oxlint": "1.57.0",
+    "oxlint-tsgolint": "0.17.3",
+    "typescript": "6.0.2"
   },
   "peerDependencies": {
     "tsup": "8.4.0"
diff --git a/packages/typescript-config/base.json b/packages/typescript-config/base.json
index 1f39d9320ca4..bd29a0a41907 100644
--- a/packages/typescript-config/base.json
+++ b/packages/typescript-config/base.json
@@ -1,6 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "compilerOptions": {
+    "types": ["node"],
     "esModuleInterop": true,
     "resolveJsonModule": true,
     "skipLibCheck": true,
diff --git a/packages/util/package.json b/packages/util/package.json
index 252990183d6b..3762c03e65a9 100644
--- a/packages/util/package.json
+++ b/packages/util/package.json
@@ -20,10 +20,10 @@
     "@monkeytype/tsup-config": "workspace:*",
     "@monkeytype/typescript-config": "workspace:*",
     "madge": "8.0.0",
-    "oxlint": "1.50.0",
-    "oxlint-tsgolint": "0.14.2",
+    "oxlint": "1.57.0",
+    "oxlint-tsgolint": "0.17.3",
     "tsup": "8.4.0",
-    "typescript": "6.0.0-beta",
+    "typescript": "6.0.2",
     "vitest": "4.1.0",
     "zod": "3.23.8"
   }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c5b07926247b..f389feec3e7f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -42,14 +42,14 @@ importers:
         specifier: 1.2.1
         version: 1.2.1
       oxfmt:
-        specifier: 0.35.0
-        version: 0.35.0
+        specifier: 0.42.0
+        version: 0.42.0
       oxlint:
-        specifier: 1.50.0
-        version: 1.50.0(oxlint-tsgolint@0.14.2)
+        specifier: 1.57.0
+        version: 1.57.0(oxlint-tsgolint@0.17.3)
       oxlint-tsgolint:
-        specifier: 0.14.2
-        version: 0.14.2
+        specifier: 0.17.3
+        version: 0.17.3
       prettier:
         specifier: 3.7.1
         version: 3.7.1
@@ -238,11 +238,11 @@ importers:
         specifier: 2.0.2
         version: 2.0.2
       oxlint:
-        specifier: 1.50.0
-        version: 1.50.0(oxlint-tsgolint@0.14.2)
+        specifier: 1.57.0
+        version: 1.57.0(oxlint-tsgolint@0.17.3)
       oxlint-tsgolint:
-        specifier: 0.14.2
-        version: 0.14.2
+        specifier: 0.17.3
+        version: 0.17.3
       readline-sync:
         specifier: 1.4.10
         version: 1.4.10
@@ -256,8 +256,8 @@ importers:
         specifier: 4.21.0
         version: 4.21.0
       typescript:
-        specifier: 6.0.0-beta
-        version: 6.0.0-beta
+        specifier: 6.0.2
+        version: 6.0.2
       vitest:
         specifier: 4.1.0
         version: 4.1.0(@opentelemetry/api@1.8.0)(@types/node@24.9.1)(happy-dom@20.0.10)(jsdom@27.4.0)(vite@8.0.1(@types/node@24.9.1)(esbuild@0.27.3)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.2))
@@ -308,10 +308,10 @@ importers:
         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.0-beta)
+        version: 1.0.27(@tanstack/query-core@5.90.20)(typescript@6.0.2)
       '@tanstack/solid-db':
         specifier: 0.2.10
-        version: 0.2.10(solid-js@1.9.10)(typescript@6.0.0-beta)
+        version: 0.2.10(solid-js@1.9.10)(typescript@6.0.2)
       '@tanstack/solid-form':
         specifier: 1.28.4
         version: 1.28.4(solid-js@1.9.10)
@@ -426,7 +426,7 @@ importers:
         version: 4.2.1(vite@8.0.1(@types/node@24.9.1)(esbuild@0.27.3)(jiti@2.6.1)(sass@1.70.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.2))
       '@tanstack/eslint-plugin-query':
         specifier: 5.91.4
-        version: 5.91.4(eslint@9.39.1(jiti@2.6.1))(typescript@6.0.0-beta)
+        version: 5.91.4(eslint@9.39.1(jiti@2.6.1))(typescript@6.0.2)
       '@testing-library/dom':
         specifier: 10.4.1
         version: 10.4.1
@@ -480,7 +480,7 @@ importers:
         version: 7.0.0(eslint@9.39.1(jiti@2.6.1))
       eslint-plugin-solid:
         specifier: 0.14.5
-        version: 0.14.5(eslint@9.39.1(jiti@2.6.1))(typescript@6.0.0-beta)
+        version: 0.14.5(eslint@9.39.1(jiti@2.6.1))(typescript@6.0.2)
       firebase-tools:
         specifier: 13.15.1
         version: 13.15.1(encoding@0.1.13)
@@ -495,7 +495,7 @@ importers:
         version: 27.4.0
       madge:
         specifier: 8.0.0
-        version: 8.0.0(typescript@6.0.0-beta)
+        version: 8.0.0(typescript@6.0.2)
       magic-string:
         specifier: 0.30.17
         version: 0.30.17
@@ -503,11 +503,11 @@ importers:
         specifier: 8.0.1
         version: 8.0.1
       oxlint:
-        specifier: 1.50.0
-        version: 1.50.0(oxlint-tsgolint@0.14.2)
+        specifier: 1.57.0
+        version: 1.57.0(oxlint-tsgolint@0.17.3)
       oxlint-tsgolint:
-        specifier: 0.14.2
-        version: 0.14.2
+        specifier: 0.17.3
+        version: 0.17.3
       postcss:
         specifier: 8.5.8
         version: 8.5.8
@@ -530,8 +530,8 @@ importers:
         specifier: 4.21.0
         version: 4.21.0
       typescript:
-        specifier: 6.0.0-beta
-        version: 6.0.0-beta
+        specifier: 6.0.2
+        version: 6.0.2
       unplugin-inject-preload:
         specifier: 3.0.0
         version: 3.0.0
@@ -561,6 +561,10 @@ importers:
         version: 4.1.0(@types/node@24.9.1)(happy-dom@20.0.10)(jsdom@27.4.0)(vite@8.0.1(@types/node@24.9.1)(esbuild@0.27.3)(jiti@2.6.1)(sass@1.70.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.2))
 
   frontend/storybook:
+    dependencies:
+      slim-select:
+        specifier: 2.9.2
+        version: 2.9.2
     devDependencies:
       '@chromatic-com/storybook':
         specifier: ^5.0.1
@@ -606,7 +610,7 @@ importers:
         version: 10.2.16(@testing-library/dom@10.4.1)(prettier@3.7.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       storybook-solidjs-vite:
         specifier: ^10.0.9
-        version: 10.0.9(@testing-library/jest-dom@6.9.1)(esbuild@0.27.3)(rollup@4.52.5)(solid-js@1.9.11)(storybook@10.2.16(@testing-library/dom@10.4.1)(prettier@3.7.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@6.0.0-beta)(vite@7.3.1(@types/node@24.9.1)(jiti@2.6.1)(lightningcss@1.32.0)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.2))
+        version: 10.0.9(@testing-library/jest-dom@6.9.1)(esbuild@0.27.3)(rollup@4.52.5)(solid-js@1.9.11)(storybook@10.2.16(@testing-library/dom@10.4.1)(prettier@3.7.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@6.0.2)(vite@7.3.1(@types/node@24.9.1)(jiti@2.6.1)(lightningcss@1.32.0)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.2))
       vite:
         specifier: ^7.3.1
         version: 7.3.1(@types/node@24.9.1)(jiti@2.6.1)(lightningcss@1.32.0)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.2)
@@ -634,19 +638,19 @@ importers:
         version: link:../typescript-config
       madge:
         specifier: 8.0.0
-        version: 8.0.0(typescript@6.0.0-beta)
+        version: 8.0.0(typescript@6.0.2)
       oxlint:
-        specifier: 1.50.0
-        version: 1.50.0(oxlint-tsgolint@0.14.2)
+        specifier: 1.57.0
+        version: 1.57.0(oxlint-tsgolint@0.17.3)
       oxlint-tsgolint:
-        specifier: 0.14.2
-        version: 0.14.2
+        specifier: 0.17.3
+        version: 0.17.3
       tsup:
         specifier: 8.4.0
-        version: 8.4.0(jiti@2.6.1)(postcss@8.5.8)(tsx@4.21.0)(typescript@6.0.0-beta)(yaml@2.8.2)
+        version: 8.4.0(jiti@2.6.1)(postcss@8.5.8)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.2)
       typescript:
-        specifier: 6.0.0-beta
-        version: 6.0.0-beta
+        specifier: 6.0.2
+        version: 6.0.2
       vitest:
         specifier: 4.1.0
         version: 4.1.0(@types/node@24.9.1)(happy-dom@20.0.10)(jsdom@27.4.0)(vite@8.0.1(@types/node@24.9.1)(esbuild@0.25.11)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.2))
@@ -668,19 +672,19 @@ importers:
         version: link:../typescript-config
       madge:
         specifier: 8.0.0
-        version: 8.0.0(typescript@6.0.0-beta)
+        version: 8.0.0(typescript@6.0.2)
       oxlint:
-        specifier: 1.50.0
-        version: 1.50.0(oxlint-tsgolint@0.14.2)
+        specifier: 1.57.0
+        version: 1.57.0(oxlint-tsgolint@0.17.3)
       oxlint-tsgolint:
-        specifier: 0.14.2
-        version: 0.14.2
+        specifier: 0.17.3
+        version: 0.17.3
       tsup:
         specifier: 8.4.0
-        version: 8.4.0(jiti@2.6.1)(postcss@8.5.8)(tsx@4.21.0)(typescript@6.0.0-beta)(yaml@2.8.2)
+        version: 8.4.0(jiti@2.6.1)(postcss@8.5.8)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.2)
       typescript:
-        specifier: 6.0.0-beta
-        version: 6.0.0-beta
+        specifier: 6.0.2
+        version: 6.0.2
       vitest:
         specifier: 4.1.0
         version: 4.1.0(@opentelemetry/api@1.8.0)(@types/node@24.9.1)(happy-dom@20.0.10)(jsdom@27.4.0)(vite@8.0.1(@types/node@24.9.1)(esbuild@0.27.3)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.2))
@@ -707,11 +711,11 @@ importers:
         specifier: 3.1.14
         version: 3.1.14
       oxlint:
-        specifier: 1.50.0
-        version: 1.50.0(oxlint-tsgolint@0.14.2)
+        specifier: 1.57.0
+        version: 1.57.0(oxlint-tsgolint@0.17.3)
       oxlint-tsgolint:
-        specifier: 0.14.2
-        version: 0.14.2
+        specifier: 0.17.3
+        version: 0.17.3
 
   packages/schemas:
     dependencies:
@@ -727,19 +731,19 @@ importers:
         version: link:../typescript-config
       madge:
         specifier: 8.0.0
-        version: 8.0.0(typescript@6.0.0-beta)
+        version: 8.0.0(typescript@6.0.2)
       oxlint:
-        specifier: 1.50.0
-        version: 1.50.0(oxlint-tsgolint@0.14.2)
+        specifier: 1.57.0
+        version: 1.57.0(oxlint-tsgolint@0.17.3)
       oxlint-tsgolint:
-        specifier: 0.14.2
-        version: 0.14.2
+        specifier: 0.17.3
+        version: 0.17.3
       tsup:
         specifier: 8.4.0
-        version: 8.4.0(jiti@2.6.1)(postcss@8.5.8)(tsx@4.21.0)(typescript@6.0.0-beta)(yaml@2.8.2)
+        version: 8.4.0(jiti@2.6.1)(postcss@8.5.8)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.2)
       typescript:
-        specifier: 6.0.0-beta
-        version: 6.0.0-beta
+        specifier: 6.0.2
+        version: 6.0.2
       vitest:
         specifier: 4.1.0
         version: 4.1.0(@opentelemetry/api@1.8.0)(@types/node@24.9.1)(happy-dom@20.0.10)(jsdom@27.4.0)(vite@8.0.1(@types/node@24.9.1)(esbuild@0.27.3)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.2))
@@ -754,14 +758,14 @@ importers:
         specifier: workspace:*
         version: link:../typescript-config
       oxlint:
-        specifier: 1.50.0
-        version: 1.50.0(oxlint-tsgolint@0.14.2)
+        specifier: 1.57.0
+        version: 1.57.0(oxlint-tsgolint@0.17.3)
       oxlint-tsgolint:
-        specifier: 0.14.2
-        version: 0.14.2
+        specifier: 0.17.3
+        version: 0.17.3
       typescript:
-        specifier: 6.0.0-beta
-        version: 6.0.0-beta
+        specifier: 6.0.2
+        version: 6.0.2
 
   packages/typescript-config: {}
 
@@ -775,19 +779,19 @@ importers:
         version: link:../typescript-config
       madge:
         specifier: 8.0.0
-        version: 8.0.0(typescript@6.0.0-beta)
+        version: 8.0.0(typescript@6.0.2)
       oxlint:
-        specifier: 1.50.0
-        version: 1.50.0(oxlint-tsgolint@0.14.2)
+        specifier: 1.57.0
+        version: 1.57.0(oxlint-tsgolint@0.17.3)
       oxlint-tsgolint:
-        specifier: 0.14.2
-        version: 0.14.2
+        specifier: 0.17.3
+        version: 0.17.3
       tsup:
         specifier: 8.4.0
-        version: 8.4.0(jiti@2.6.1)(postcss@8.5.8)(tsx@4.21.0)(typescript@6.0.0-beta)(yaml@2.8.2)
+        version: 8.4.0(jiti@2.6.1)(postcss@8.5.8)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.2)
       typescript:
-        specifier: 6.0.0-beta
-        version: 6.0.0-beta
+        specifier: 6.0.2
+        version: 6.0.2
       vitest:
         specifier: 4.1.0
         version: 4.1.0(@opentelemetry/api@1.8.0)(@types/node@24.9.1)(happy-dom@20.0.10)(jsdom@27.4.0)(vite@8.0.1(@types/node@24.9.1)(esbuild@0.27.3)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.2))
@@ -2631,260 +2635,260 @@ packages:
   '@oxc-project/types@0.120.0':
     resolution: {integrity: sha512-k1YNu55DuvAip/MGE1FTsIuU3FUCn6v/ujG9V7Nq5Df/kX2CWb13hhwD0lmJGMGqE+bE1MXvv9SZVnMzEXlWcg==}
 
-  '@oxfmt/binding-android-arm-eabi@0.35.0':
-    resolution: {integrity: sha512-BaRKlM3DyG81y/xWTsE6gZiv89F/3pHe2BqX2H4JbiB8HNVlWWtplzgATAE5IDSdwChdeuWLDTQzJ92Lglw3ZA==}
+  '@oxfmt/binding-android-arm-eabi@0.42.0':
+    resolution: {integrity: sha512-dsqPTYsozeokRjlrt/b4E7Pj0z3eS3Eg74TWQuuKbjY4VttBmA88rB7d50Xrd+TZ986qdXCNeZRPEzZHAe+jow==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [android]
 
-  '@oxfmt/binding-android-arm64@0.35.0':
-    resolution: {integrity: sha512-/O+EbuAJYs6nde/anv+aID6uHsGQApyE9JtYBo/79KyU8e6RBN3DMbT0ix97y1SOnCglurmL2iZ+hlohjP2PnQ==}
+  '@oxfmt/binding-android-arm64@0.42.0':
+    resolution: {integrity: sha512-t+aAjHxcr5eOBphFHdg1ouQU9qmZZoRxnX7UOJSaTwSoKsb6TYezNKO0YbWytGXCECObRqNcUxPoPr0KaraAIg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [android]
 
-  '@oxfmt/binding-darwin-arm64@0.35.0':
-    resolution: {integrity: sha512-pGqRtqlNdn9d4VrmGUWVyQjkw79ryhI6je9y2jfqNUIZCfqceob+R97YYAoG7C5TFyt8ILdLVoN+L2vw/hSFyA==}
+  '@oxfmt/binding-darwin-arm64@0.42.0':
+    resolution: {integrity: sha512-ulpSEYMKg61C5bRMZinFHrKJYRoKGVbvMEXA5zM1puX3O9T6Q4XXDbft20yrDijpYWeuG59z3Nabt+npeTsM1A==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [darwin]
 
-  '@oxfmt/binding-darwin-x64@0.35.0':
-    resolution: {integrity: sha512-8GmsDcSozTPjrCJeGpp+sCmS9+9V5yRrdEZ1p/sTWxPG5nYeAfSLuS0nuEYjXSO+CtdSbStIW6dxa+4NM58yRw==}
+  '@oxfmt/binding-darwin-x64@0.42.0':
+    resolution: {integrity: sha512-ttxLKhQYPdFiM8I/Ri37cvqChE4Xa562nNOsZFcv1CKTVLeEozXjKuYClNvxkXmNlcF55nzM80P+CQkdFBu+uQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [darwin]
 
-  '@oxfmt/binding-freebsd-x64@0.35.0':
-    resolution: {integrity: sha512-QyfKfTe0ytHpFKHAcHCGQEzN45QSqq1AHJOYYxQMgLM3KY4xu8OsXHpCnINjDsV4XGnQzczJDU9e04Zmd8XqIQ==}
+  '@oxfmt/binding-freebsd-x64@0.42.0':
+    resolution: {integrity: sha512-Og7QS3yI3tdIKYZ58SXik0rADxIk2jmd+/YvuHRyKULWpG4V2fR5V4hvKm624Mc0cQET35waPXiCQWvjQEjwYQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [freebsd]
 
-  '@oxfmt/binding-linux-arm-gnueabihf@0.35.0':
-    resolution: {integrity: sha512-u+kv3JD6P3J38oOyUaiCqgY5TNESzBRZJ5lyZQ6c2czUW2v5SIN9E/KWWa9vxoc+P8AFXQFUVrdzGy1tK+nbPQ==}
+  '@oxfmt/binding-linux-arm-gnueabihf@0.42.0':
+    resolution: {integrity: sha512-jwLOw/3CW4H6Vxcry4/buQHk7zm9Ne2YsidzTL1kpiMe4qqrRCwev3dkyWe2YkFmP+iZCQ7zku4KwjcLRoh8ew==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@oxfmt/binding-linux-arm-musleabihf@0.35.0':
-    resolution: {integrity: sha512-1NiZroCiV57I7Pf8kOH4XGR366kW5zir3VfSMBU2D0V14GpYjiYmPYFAoJboZvp8ACnZKUReWyMkNKSa5ad58A==}
+  '@oxfmt/binding-linux-arm-musleabihf@0.42.0':
+    resolution: {integrity: sha512-XwXu2vkMtiq2h7tfvN+WA/9/5/1IoGAVCFPiiQUvcAuG3efR97KNcRGM8BetmbYouFotQ2bDal3yyjUx6IPsTg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@oxfmt/binding-linux-arm64-gnu@0.35.0':
-    resolution: {integrity: sha512-7Q0Xeg7ZnW2nxnZ4R7aF6DEbCFls4skgHZg+I63XitpNvJCbVIU8MFOTZlvZGRsY9+rPgWPQGeUpLHlyx0wvMA==}
+  '@oxfmt/binding-linux-arm64-gnu@0.42.0':
+    resolution: {integrity: sha512-ea7s/XUJoT7ENAtUQDudFe3nkSM3e3Qpz4nJFRdzO2wbgXEcjnchKLEsV3+t4ev3r8nWxIYr9NRjPWtnyIFJVA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
 
-  '@oxfmt/binding-linux-arm64-musl@0.35.0':
-    resolution: {integrity: sha512-5Okqi+uhYFxwKz8hcnUftNNwdm8BCkf6GSCbcz9xJxYMm87k1E4p7PEmAAbhLTk7cjSdDre6TDL0pDzNX+Y22Q==}
+  '@oxfmt/binding-linux-arm64-musl@0.42.0':
+    resolution: {integrity: sha512-+JA0YMlSdDqmacygGi2REp57c3fN+tzARD8nwsukx9pkCHK+6DkbAA9ojS4lNKsiBjIW8WWa0pBrBWhdZEqfuw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
 
-  '@oxfmt/binding-linux-ppc64-gnu@0.35.0':
-    resolution: {integrity: sha512-9k66pbZQXM/lBJWys3Xbc5yhl4JexyfqkEf/tvtq8976VIJnLAAL3M127xHA3ifYSqxdVHfVGTg84eiBHCGcNw==}
+  '@oxfmt/binding-linux-ppc64-gnu@0.42.0':
+    resolution: {integrity: sha512-VfnET0j4Y5mdfCzh5gBt0NK28lgn5DKx+8WgSMLYYeSooHhohdbzwAStLki9pNuGy51y4I7IoW8bqwAaCMiJQg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ppc64]
     os: [linux]
 
-  '@oxfmt/binding-linux-riscv64-gnu@0.35.0':
-    resolution: {integrity: sha512-aUcY9ofKPtjO52idT6t0SAQvEF6ctjzUQa1lLp7GDsRpSBvuTrBQGeq0rYKz3gN8dMIQ7mtMdGD9tT4LhR8jAQ==}
+  '@oxfmt/binding-linux-riscv64-gnu@0.42.0':
+    resolution: {integrity: sha512-gVlCbmBkB0fxBWbhBj9rcxezPydsQHf4MFKeHoTSPicOQ+8oGeTQgQ8EeesSybWeiFPVRx3bgdt4IJnH6nOjAA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
 
-  '@oxfmt/binding-linux-riscv64-musl@0.35.0':
-    resolution: {integrity: sha512-C6yhY5Hvc2sGM+mCPek9ZLe5xRUOC/BvhAt2qIWFAeXMn4il04EYIjl3DsWiJr0xDMTJhvMOmD55xTRPlNp39w==}
+  '@oxfmt/binding-linux-riscv64-musl@0.42.0':
+    resolution: {integrity: sha512-zN5OfstL0avgt/IgvRu0zjQzVh/EPkcLzs33E9LMAzpqlLWiPWeMDZyMGFlSRGOdDjuNmlZBCgj0pFnK5u32TQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
 
-  '@oxfmt/binding-linux-s390x-gnu@0.35.0':
-    resolution: {integrity: sha512-RG2hlvOMK4OMZpO3mt8MpxLQ0AAezlFqhn5mI/g5YrVbPFyoCv9a34AAvbSJS501ocOxlFIRcKEuw5hFvddf9g==}
+  '@oxfmt/binding-linux-s390x-gnu@0.42.0':
+    resolution: {integrity: sha512-9X6+H2L0qMc2sCAgO9HS03bkGLMKvOFjmEdchaFlany3vNZOjnVui//D8k/xZAtQv2vaCs1reD5KAgPoIU4msA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [s390x]
     os: [linux]
 
-  '@oxfmt/binding-linux-x64-gnu@0.35.0':
-    resolution: {integrity: sha512-wzmh90Pwvqj9xOKHJjkQYBpydRkaXG77ZvDz+iFDRRQpnqIEqGm5gmim2s6vnZIkDGsvKCuTdtxm0GFmBjM1+w==}
+  '@oxfmt/binding-linux-x64-gnu@0.42.0':
+    resolution: {integrity: sha512-BajxJ6KQvMMdpXGPWhBGyjb2Jvx4uec0w+wi6TJZ6Tv7+MzPwe0pO8g5h1U0jyFgoaF7mDl6yKPW3ykWcbUJRw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
 
-  '@oxfmt/binding-linux-x64-musl@0.35.0':
-    resolution: {integrity: sha512-+HCqYCJPCUy5I+b2cf+gUVaApfgtoQT3HdnSg/l7NIcLHOhKstlYaGyrFZLmUpQt4WkFbpGKZZayG6zjRU0KFA==}
+  '@oxfmt/binding-linux-x64-musl@0.42.0':
+    resolution: {integrity: sha512-0wV284I6vc5f0AqAhgAbHU2935B4bVpncPoe5n/WzVZY/KnHgqxC8iSFGeSyLWEgstFboIcWkOPck7tqbdHkzA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
 
-  '@oxfmt/binding-openharmony-arm64@0.35.0':
-    resolution: {integrity: sha512-kFYmWfR9YL78XyO5ws+1dsxNvZoD973qfVMNFOS4e9bcHXGF7DvGC2tY5UDFwyMCeB33t3sDIuGONKggnVNSJA==}
+  '@oxfmt/binding-openharmony-arm64@0.42.0':
+    resolution: {integrity: sha512-p4BG6HpGnhfgHk1rzZfyR6zcWkE7iLrWxyehHfXUy4Qa5j3e0roglFOdP/Nj5cJJ58MA3isQ5dlfkW2nNEpolw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [openharmony]
 
-  '@oxfmt/binding-win32-arm64-msvc@0.35.0':
-    resolution: {integrity: sha512-uD/NGdM65eKNCDGyTGdO8e9n3IHX+wwuorBvEYrPJXhDXL9qz6gzddmXH8EN04ejUXUujlq4FsoSeCfbg0Y+Jg==}
+  '@oxfmt/binding-win32-arm64-msvc@0.42.0':
+    resolution: {integrity: sha512-mn//WV60A+IetORDxYieYGAoQso4KnVRRjORDewMcod4irlRe0OSC7YPhhwaexYNPQz/GCFk+v9iUcZ2W22yxQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [win32]
 
-  '@oxfmt/binding-win32-ia32-msvc@0.35.0':
-    resolution: {integrity: sha512-oSRD2k8J2uxYDEKR2nAE/YTY9PobOEnhZgCmspHu0+yBQ665yH8lFErQVSTE7fcGJmJp/cC6322/gc8VFuQf7g==}
+  '@oxfmt/binding-win32-ia32-msvc@0.42.0':
+    resolution: {integrity: sha512-3gWltUrvuz4LPJXWivoAxZ28Of2O4N7OGuM5/X3ubPXCEV8hmgECLZzjz7UYvSDUS3grfdccQwmjynm+51EFpw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ia32]
     os: [win32]
 
-  '@oxfmt/binding-win32-x64-msvc@0.35.0':
-    resolution: {integrity: sha512-WCDJjlS95NboR0ugI2BEwzt1tYvRDorDRM9Lvctls1SLyKYuNRCyrPwp1urUPFBnwgBNn9p2/gnmo7gFMySRoQ==}
+  '@oxfmt/binding-win32-x64-msvc@0.42.0':
+    resolution: {integrity: sha512-Wg4TMAfQRL9J9AZevJ/ZNy3uyyDztDYQtGr4P8UyyzIhLhFrdSmz1J/9JT+rv0fiCDLaFOBQnj3f3K3+a5PzDQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [win32]
 
-  '@oxlint-tsgolint/darwin-arm64@0.14.2':
-    resolution: {integrity: sha512-03WxIXguCXf1pTmoG2C6vqRcbrU9GaJCW6uTIiQdIQq4BrJnVWZv99KEUQQRkuHK78lOLa9g7B4K58NcVcB54g==}
+  '@oxlint-tsgolint/darwin-arm64@0.17.3':
+    resolution: {integrity: sha512-5aDl4mxXWs+Bj02pNrX6YY6v9KMZjLIytXoqolLEo0dfBNVeZUonZgJAa/w0aUmijwIRrBhxEzb42oLuUtfkGw==}
     cpu: [arm64]
     os: [darwin]
 
-  '@oxlint-tsgolint/darwin-x64@0.14.2':
-    resolution: {integrity: sha512-ksMLl1cIWz3Jw+U79BhyCPdvohZcJ/xAKri5bpT6oeEM2GVnQCHBk/KZKlYrd7hZUTxz0sLnnKHE11XFnLASNQ==}
+  '@oxlint-tsgolint/darwin-x64@0.17.3':
+    resolution: {integrity: sha512-gPBy4DS5ueCgXzko20XsNZzDe/Cxde056B+QuPLGvz05CGEAtmRfpImwnyY2lAXXjPL+SmnC/OYexu8zI12yHQ==}
     cpu: [x64]
     os: [darwin]
 
-  '@oxlint-tsgolint/linux-arm64@0.14.2':
-    resolution: {integrity: sha512-2BgR535w7GLxBCyQD5DR3dBzbAgiBbG5QX1kAEVzOmWxJhhGxt5lsHdHebRo7ilukYLpBDkerz0mbMErblghCQ==}
+  '@oxlint-tsgolint/linux-arm64@0.17.3':
+    resolution: {integrity: sha512-+pkunvCfB6pB0G9qHVVXUao3nqzXQPo4O3DReIi+5nGa+bOU3J3Srgy+Zb8VyOL+WDsSMJ+U7+r09cKHWhz3hg==}
     cpu: [arm64]
     os: [linux]
 
-  '@oxlint-tsgolint/linux-x64@0.14.2':
-    resolution: {integrity: sha512-TUHFyVHfbbGtnTQZbUFgwvv3NzXBgzNLKdMUJw06thpiC7u5OW5qdk4yVXIC/xeVvdl3NAqTfcT4sA32aiMubg==}
+  '@oxlint-tsgolint/linux-x64@0.17.3':
+    resolution: {integrity: sha512-/kW5oXtBThu4FjmgIBthdmMjWLzT3M1TEDQhxDu7hQU5xDeTd60CDXb2SSwKCbue9xu7MbiFoJu83LN0Z/d38g==}
     cpu: [x64]
     os: [linux]
 
-  '@oxlint-tsgolint/win32-arm64@0.14.2':
-    resolution: {integrity: sha512-OfYHa/irfVggIFEC4TbawsI7Hwrttppv//sO/e00tu4b2QRga7+VHAwtCkSFWSr0+BsO4InRYVA0+pun5BinpQ==}
+  '@oxlint-tsgolint/win32-arm64@0.17.3':
+    resolution: {integrity: sha512-NMELRvbz4Ed4dxg8WiqZxtu3k4OJEp2B9KInZW+BMfqEqbwZdEJY83tbqz2hD1EjKO2akrqBQ0GpRUJEkd8kKw==}
     cpu: [arm64]
     os: [win32]
 
-  '@oxlint-tsgolint/win32-x64@0.14.2':
-    resolution: {integrity: sha512-5gxwbWYE2pP+pzrO4SEeYvLk4N609eAe18rVXUx+en3qtHBkU8VM2jBmMcZdIHn+G05leu4pYvwAvw6tvT9VbA==}
+  '@oxlint-tsgolint/win32-x64@0.17.3':
+    resolution: {integrity: sha512-+pJ7r8J3SLPws5uoidVplZc8R/lpKyKPE6LoPGv9BME00Y1VjT6jWGx/dtUN8PWvcu3iTC6k+8u3ojFSJNmWTg==}
     cpu: [x64]
     os: [win32]
 
-  '@oxlint/binding-android-arm-eabi@1.50.0':
-    resolution: {integrity: sha512-G7MRGk/6NCe+L8ntonRdZP7IkBfEpiZ/he3buLK6JkLgMHgJShXZ+BeOwADmspXez7U7F7L1Anf4xLSkLHiGTg==}
+  '@oxlint/binding-android-arm-eabi@1.57.0':
+    resolution: {integrity: sha512-C7EiyfAJG4B70496eV543nKiq5cH0o/xIh/ufbjQz3SIvHhlDDsyn+mRFh+aW8KskTyUpyH2LGWL8p2oN6bl1A==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [android]
 
-  '@oxlint/binding-android-arm64@1.50.0':
-    resolution: {integrity: sha512-GeSuMoJWCVpovJi/e3xDSNgjeR8WEZ6MCXL6EtPiCIM2NTzv7LbflARINTXTJy2oFBYyvdf/l2PwHzYo6EdXvg==}
+  '@oxlint/binding-android-arm64@1.57.0':
+    resolution: {integrity: sha512-9i80AresjZ/FZf5xK8tKFbhQnijD4s1eOZw6/FHUwD59HEZbVLRc2C88ADYJfLZrF5XofWDiRX/Ja9KefCLy7w==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [android]
 
-  '@oxlint/binding-darwin-arm64@1.50.0':
-    resolution: {integrity: sha512-w3SY5YtxGnxCHPJ8Twl3KmS9oja1gERYk3AMoZ7Hv8P43ZtB6HVfs02TxvarxfL214Tm3uzvc2vn+DhtUNeKnw==}
+  '@oxlint/binding-darwin-arm64@1.57.0':
+    resolution: {integrity: sha512-0eUfhRz5L2yKa9I8k3qpyl37XK3oBS5BvrgdVIx599WZK63P8sMbg+0s4IuxmIiZuBK68Ek+Z+gcKgeYf0otsg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [darwin]
 
-  '@oxlint/binding-darwin-x64@1.50.0':
-    resolution: {integrity: sha512-hNfogDqy7tvmllXKBSlHo6k5x7dhTUVOHbMSE15CCAcXzmqf5883aPvBYPOq9AE7DpDUQUZ1kVE22YbiGW+tuw==}
+  '@oxlint/binding-darwin-x64@1.57.0':
+    resolution: {integrity: sha512-UvrSuzBaYOue+QMAcuDITe0k/Vhj6KZGjfnI6x+NkxBTke/VoM7ZisaxgNY0LWuBkTnd1OmeQfEQdQ48fRjkQg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [darwin]
 
-  '@oxlint/binding-freebsd-x64@1.50.0':
-    resolution: {integrity: sha512-ykZevOWEyu0nsxolA911ucxpEv0ahw8jfEeGWOwwb/VPoE4xoexuTOAiPNlWZNJqANlJl7yp8OyzCtXTUAxotw==}
+  '@oxlint/binding-freebsd-x64@1.57.0':
+    resolution: {integrity: sha512-wtQq0dCoiw4bUwlsNVDJJ3pxJA218fOezpgtLKrbQqUtQJcM9yP8z+I9fu14aHg0uyAxIY+99toL6uBa2r7nxA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [freebsd]
 
-  '@oxlint/binding-linux-arm-gnueabihf@1.50.0':
-    resolution: {integrity: sha512-hif3iDk7vo5GGJ4OLCCZAf2vjnU9FztGw4L0MbQL0M2iY9LKFtDMMiQAHmkF0PQGQMVbTYtPdXCLKVgdkiqWXQ==}
+  '@oxlint/binding-linux-arm-gnueabihf@1.57.0':
+    resolution: {integrity: sha512-qxFWl2BBBFcT4djKa+OtMdnLgoHEJXpqjyGwz8OhW35ImoCwR5qtAGqApNYce5260FQqoAHW8S8eZTjiX67Tsg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@oxlint/binding-linux-arm-musleabihf@1.50.0':
-    resolution: {integrity: sha512-dVp9iSssiGAnTNey2Ruf6xUaQhdnvcFOJyRWd/mu5o2jVbFK15E5fbWGeFRfmuobu5QXuROtFga44+7DOS3PLg==}
+  '@oxlint/binding-linux-arm-musleabihf@1.57.0':
+    resolution: {integrity: sha512-SQoIsBU7J0bDW15/f0/RvxHfY3Y0+eB/caKBQtNFbuerTiA6JCYx9P1MrrFTwY2dTm/lMgTSgskvCEYk2AtG/Q==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@oxlint/binding-linux-arm64-gnu@1.50.0':
-    resolution: {integrity: sha512-1cT7yz2HA910CKA9NkH1ZJo50vTtmND2fkoW1oyiSb0j6WvNtJ0Wx2zoySfXWc/c+7HFoqRK5AbEoL41LOn9oA==}
+  '@oxlint/binding-linux-arm64-gnu@1.57.0':
+    resolution: {integrity: sha512-jqxYd1W6WMeozsCmqe9Rzbu3SRrGTyGDAipRlRggetyYbUksJqJKvUNTQtZR/KFoJPb+grnSm5SHhdWrywv3RQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
 
-  '@oxlint/binding-linux-arm64-musl@1.50.0':
-    resolution: {integrity: sha512-++B3k/HEPFVlj89cOz8kWfQccMZB/aWL9AhsW7jPIkG++63Mpwb2cE9XOEsd0PATbIan78k2Gky+09uWM1d/gQ==}
+  '@oxlint/binding-linux-arm64-musl@1.57.0':
+    resolution: {integrity: sha512-i66WyEPVEvq9bxRUCJ/MP5EBfnTDN3nhwEdFZFTO5MmLLvzngfWEG3NSdXQzTT3vk5B9i6C2XSIYBh+aG6uqyg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
 
-  '@oxlint/binding-linux-ppc64-gnu@1.50.0':
-    resolution: {integrity: sha512-Z9b/KpFMkx66w3gVBqjIC1AJBTZAGoI9+U+K5L4QM0CB/G0JSNC1es9b3Y0Vcrlvtdn8A+IQTkYjd/Q0uCSaZw==}
+  '@oxlint/binding-linux-ppc64-gnu@1.57.0':
+    resolution: {integrity: sha512-oMZDCwz4NobclZU3pH+V1/upVlJZiZvne4jQP+zhJwt+lmio4XXr4qG47CehvrW1Lx2YZiIHuxM2D4YpkG3KVA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ppc64]
     os: [linux]
 
-  '@oxlint/binding-linux-riscv64-gnu@1.50.0':
-    resolution: {integrity: sha512-jvmuIw8wRSohsQlFNIST5uUwkEtEJmOQYr33bf/K2FrFPXHhM4KqGekI3ShYJemFS/gARVacQFgBzzJKCAyJjg==}
+  '@oxlint/binding-linux-riscv64-gnu@1.57.0':
+    resolution: {integrity: sha512-uoBnjJ3MMEBbfnWC1jSFr7/nSCkcQYa72NYoNtLl1imshDnWSolYCjzb8LVCwYCCfLJXD+0gBLD7fyC14c0+0g==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
 
-  '@oxlint/binding-linux-riscv64-musl@1.50.0':
-    resolution: {integrity: sha512-x+UrN47oYNh90nmAAyql8eQaaRpHbDPu5guasDg10+OpszUQ3/1+1J6zFMmV4xfIEgTcUXG/oI5fxJhF4eWCNA==}
+  '@oxlint/binding-linux-riscv64-musl@1.57.0':
+    resolution: {integrity: sha512-BdrwD7haPZ8a9KrZhKJRSj6jwCor+Z8tHFZ3PT89Y3Jq5v3LfMfEePeAmD0LOTWpiTmzSzdmyw9ijneapiVHKQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
 
-  '@oxlint/binding-linux-s390x-gnu@1.50.0':
-    resolution: {integrity: sha512-i/JLi2ljLUIVfekMj4ISmdt+Hn11wzYUdRRrkVUYsCWw7zAy5xV7X9iA+KMyM156LTFympa7s3oKBjuCLoTAUQ==}
+  '@oxlint/binding-linux-s390x-gnu@1.57.0':
+    resolution: {integrity: sha512-BNs+7ZNsRstVg2tpNxAXfMX/Iv5oZh204dVyb8Z37+/gCh+yZqNTlg6YwCLIMPSk5wLWIGOaQjT0GUOahKYImw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [s390x]
     os: [linux]
 
-  '@oxlint/binding-linux-x64-gnu@1.50.0':
-    resolution: {integrity: sha512-/C7brhn6c6UUPccgSPCcpLQXcp+xKIW/3sji/5VZ8/OItL3tQ2U7KalHz887UxxSQeEOmd1kY6lrpuwFnmNqOA==}
+  '@oxlint/binding-linux-x64-gnu@1.57.0':
+    resolution: {integrity: sha512-AghS18w+XcENcAX0+BQGLiqjpqpaxKJa4cWWP0OWNLacs27vHBxu7TYkv9LUSGe5w8lOJHeMxcYfZNOAPqw2bg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
 
-  '@oxlint/binding-linux-x64-musl@1.50.0':
-    resolution: {integrity: sha512-oDR1f+bGOYU8LfgtEW8XtotWGB63ghtcxk5Jm6IDTCk++rTA/IRMsjOid2iMd+1bW+nP9Mdsmcdc7VbPD3+iyQ==}
+  '@oxlint/binding-linux-x64-musl@1.57.0':
+    resolution: {integrity: sha512-E/FV3GB8phu/Rpkhz5T96hAiJlGzn91qX5yj5gU754P5cmVGXY1Jw/VSjDSlZBCY3VHjsVLdzgdkJaomEmcNOg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
 
-  '@oxlint/binding-openharmony-arm64@1.50.0':
-    resolution: {integrity: sha512-4CmRGPp5UpvXyu4jjP9Tey/SrXDQLRvZXm4pb4vdZBxAzbFZkCyh0KyRy4txld/kZKTJlW4TO8N1JKrNEk+mWw==}
+  '@oxlint/binding-openharmony-arm64@1.57.0':
+    resolution: {integrity: sha512-xvZ2yZt0nUVfU14iuGv3V25jpr9pov5N0Wr28RXnHFxHCRxNDMtYPHV61gGLhN9IlXM96gI4pyYpLSJC5ClLCQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [openharmony]
 
-  '@oxlint/binding-win32-arm64-msvc@1.50.0':
-    resolution: {integrity: sha512-Fq0M6vsGcFsSfeuWAACDhd5KJrO85ckbEfe1EGuBj+KPyJz7KeWte2fSFrFGmNKNXyhEMyx4tbgxiWRujBM2KQ==}
+  '@oxlint/binding-win32-arm64-msvc@1.57.0':
+    resolution: {integrity: sha512-Z4D8Pd0AyHBKeazhdIXeUUy5sIS3Mo0veOlzlDECg6PhRRKgEsBJCCV1n+keUZtQ04OP+i7+itS3kOykUyNhDg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [win32]
 
-  '@oxlint/binding-win32-ia32-msvc@1.50.0':
-    resolution: {integrity: sha512-qTdWR9KwY/vxJGhHVIZG2eBOhidOQvOwzDxnX+jhW/zIVacal1nAhR8GLkiywW8BIFDkQKXo/zOfT+/DY+ns/w==}
+  '@oxlint/binding-win32-ia32-msvc@1.57.0':
+    resolution: {integrity: sha512-StOZ9nFMVKvevicbQfql6Pouu9pgbeQnu60Fvhz2S6yfMaii+wnueLnqQ5I1JPgNF0Syew4voBlAaHD13wH6tw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ia32]
     os: [win32]
 
-  '@oxlint/binding-win32-x64-msvc@1.50.0':
-    resolution: {integrity: sha512-682t7npLC4G2Ca+iNlI9fhAKTcFPYYXJjwoa88H4q+u5HHHlsnL/gHULapX3iqp+A8FIJbgdylL5KMYo2LaluQ==}
+  '@oxlint/binding-win32-x64-msvc@1.57.0':
+    resolution: {integrity: sha512-6PuxhYgth8TuW0+ABPOIkGdBYw+qYGxgIdXPHSVpiCDm+hqTTWCmC739St1Xni0DJBt8HnSHTG67i1y6gr8qrA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [win32]
@@ -8250,21 +8254,21 @@ packages:
     resolution: {integrity: sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==}
     engines: {node: '>= 0.4'}
 
-  oxfmt@0.35.0:
-    resolution: {integrity: sha512-QYeXWkP+aLt7utt5SLivNIk09glWx9QE235ODjgcEZ3sd1VMaUBSpLymh6ZRCA76gD2rMP4bXanUz/fx+nLM9Q==}
+  oxfmt@0.42.0:
+    resolution: {integrity: sha512-QhejGErLSMReNuZ6vxgFHDyGoPbjTRNi6uGHjy0cvIjOQFqD6xmr/T+3L41ixR3NIgzcNiJ6ylQKpvShTgDfqg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
 
-  oxlint-tsgolint@0.14.2:
-    resolution: {integrity: sha512-XJsFIQwnYJgXFlNDz2MncQMWYxwnfy4BCy73mdiFN/P13gEZrAfBU4Jmz2XXFf9UG0wPILdi7hYa6t0KmKQLhw==}
+  oxlint-tsgolint@0.17.3:
+    resolution: {integrity: sha512-1eh4bcpOMw0e7+YYVxmhFc2mo/V6hJ2+zfukqf+GprvVn3y94b69M/xNrYLmx5A+VdYe0i/bJ2xOs6Hp/jRmRA==}
     hasBin: true
 
-  oxlint@1.50.0:
-    resolution: {integrity: sha512-iSJ4IZEICBma8cZX7kxIIz9PzsYLF2FaLAYN6RKu7VwRVKdu7RIgpP99bTZaGl//Yao7fsaGZLSEo5xBrI5ReQ==}
+  oxlint@1.57.0:
+    resolution: {integrity: sha512-DGFsuBX5MFZX9yiDdtKjTrYPq45CZ8Fft6qCltJITYZxfwYjVdGf/6wycGYTACloauwIPxUnYhBVeZbHvleGhw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
     peerDependencies:
-      oxlint-tsgolint: '>=0.14.1'
+      oxlint-tsgolint: '>=0.15.0'
     peerDependenciesMeta:
       oxlint-tsgolint:
         optional: true
@@ -8481,10 +8485,18 @@ packages:
     resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
     engines: {node: '>=8.6'}
 
+  picomatch@2.3.2:
+    resolution: {integrity: sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==}
+    engines: {node: '>=8.6'}
+
   picomatch@4.0.3:
     resolution: {integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==}
     engines: {node: '>=12'}
 
+  picomatch@4.0.4:
+    resolution: {integrity: sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==}
+    engines: {node: '>=12'}
+
   pidtree@0.6.0:
     resolution: {integrity: sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==}
     engines: {node: '>=0.10'}
@@ -10043,6 +10055,11 @@ packages:
     engines: {node: '>=14.17'}
     hasBin: true
 
+  typescript@6.0.2:
+    resolution: {integrity: sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ==}
+    engines: {node: '>=14.17'}
+    hasBin: true
+
   ua-parser-js@0.7.33:
     resolution: {integrity: sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw==}
 
@@ -11911,7 +11928,7 @@ snapshots:
 
   '@eslint/eslintrc@3.3.3':
     dependencies:
-      ajv: 6.14.0
+      ajv: 6.12.6
       debug: 4.4.3(supports-color@5.5.0)
       espree: 10.4.0
       globals: 14.0.0
@@ -12620,13 +12637,13 @@ snapshots:
       wrap-ansi: 8.1.0
       wrap-ansi-cjs: wrap-ansi@7.0.0
 
-  '@joshwooding/vite-plugin-react-docgen-typescript@0.6.4(typescript@6.0.0-beta)(vite@7.3.1(@types/node@24.9.1)(jiti@2.6.1)(lightningcss@1.32.0)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.2))':
+  '@joshwooding/vite-plugin-react-docgen-typescript@0.6.4(typescript@6.0.2)(vite@7.3.1(@types/node@24.9.1)(jiti@2.6.1)(lightningcss@1.32.0)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.2))':
     dependencies:
       glob: 13.0.6
-      react-docgen-typescript: 2.4.0(typescript@6.0.0-beta)
+      react-docgen-typescript: 2.4.0(typescript@6.0.2)
       vite: 7.3.1(@types/node@24.9.1)(jiti@2.6.1)(lightningcss@1.32.0)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.2)
     optionalDependencies:
-      typescript: 6.0.0-beta
+      typescript: 6.0.2
 
   '@jridgewell/gen-mapping@0.3.13':
     dependencies:
@@ -12918,136 +12935,136 @@ snapshots:
 
   '@oxc-project/types@0.120.0': {}
 
-  '@oxfmt/binding-android-arm-eabi@0.35.0':
+  '@oxfmt/binding-android-arm-eabi@0.42.0':
     optional: true
 
-  '@oxfmt/binding-android-arm64@0.35.0':
+  '@oxfmt/binding-android-arm64@0.42.0':
     optional: true
 
-  '@oxfmt/binding-darwin-arm64@0.35.0':
+  '@oxfmt/binding-darwin-arm64@0.42.0':
     optional: true
 
-  '@oxfmt/binding-darwin-x64@0.35.0':
+  '@oxfmt/binding-darwin-x64@0.42.0':
     optional: true
 
-  '@oxfmt/binding-freebsd-x64@0.35.0':
+  '@oxfmt/binding-freebsd-x64@0.42.0':
     optional: true
 
-  '@oxfmt/binding-linux-arm-gnueabihf@0.35.0':
+  '@oxfmt/binding-linux-arm-gnueabihf@0.42.0':
     optional: true
 
-  '@oxfmt/binding-linux-arm-musleabihf@0.35.0':
+  '@oxfmt/binding-linux-arm-musleabihf@0.42.0':
     optional: true
 
-  '@oxfmt/binding-linux-arm64-gnu@0.35.0':
+  '@oxfmt/binding-linux-arm64-gnu@0.42.0':
     optional: true
 
-  '@oxfmt/binding-linux-arm64-musl@0.35.0':
+  '@oxfmt/binding-linux-arm64-musl@0.42.0':
     optional: true
 
-  '@oxfmt/binding-linux-ppc64-gnu@0.35.0':
+  '@oxfmt/binding-linux-ppc64-gnu@0.42.0':
     optional: true
 
-  '@oxfmt/binding-linux-riscv64-gnu@0.35.0':
+  '@oxfmt/binding-linux-riscv64-gnu@0.42.0':
     optional: true
 
-  '@oxfmt/binding-linux-riscv64-musl@0.35.0':
+  '@oxfmt/binding-linux-riscv64-musl@0.42.0':
     optional: true
 
-  '@oxfmt/binding-linux-s390x-gnu@0.35.0':
+  '@oxfmt/binding-linux-s390x-gnu@0.42.0':
     optional: true
 
-  '@oxfmt/binding-linux-x64-gnu@0.35.0':
+  '@oxfmt/binding-linux-x64-gnu@0.42.0':
     optional: true
 
-  '@oxfmt/binding-linux-x64-musl@0.35.0':
+  '@oxfmt/binding-linux-x64-musl@0.42.0':
     optional: true
 
-  '@oxfmt/binding-openharmony-arm64@0.35.0':
+  '@oxfmt/binding-openharmony-arm64@0.42.0':
     optional: true
 
-  '@oxfmt/binding-win32-arm64-msvc@0.35.0':
+  '@oxfmt/binding-win32-arm64-msvc@0.42.0':
     optional: true
 
-  '@oxfmt/binding-win32-ia32-msvc@0.35.0':
+  '@oxfmt/binding-win32-ia32-msvc@0.42.0':
     optional: true
 
-  '@oxfmt/binding-win32-x64-msvc@0.35.0':
+  '@oxfmt/binding-win32-x64-msvc@0.42.0':
     optional: true
 
-  '@oxlint-tsgolint/darwin-arm64@0.14.2':
+  '@oxlint-tsgolint/darwin-arm64@0.17.3':
     optional: true
 
-  '@oxlint-tsgolint/darwin-x64@0.14.2':
+  '@oxlint-tsgolint/darwin-x64@0.17.3':
     optional: true
 
-  '@oxlint-tsgolint/linux-arm64@0.14.2':
+  '@oxlint-tsgolint/linux-arm64@0.17.3':
     optional: true
 
-  '@oxlint-tsgolint/linux-x64@0.14.2':
+  '@oxlint-tsgolint/linux-x64@0.17.3':
     optional: true
 
-  '@oxlint-tsgolint/win32-arm64@0.14.2':
+  '@oxlint-tsgolint/win32-arm64@0.17.3':
     optional: true
 
-  '@oxlint-tsgolint/win32-x64@0.14.2':
+  '@oxlint-tsgolint/win32-x64@0.17.3':
     optional: true
 
-  '@oxlint/binding-android-arm-eabi@1.50.0':
+  '@oxlint/binding-android-arm-eabi@1.57.0':
     optional: true
 
-  '@oxlint/binding-android-arm64@1.50.0':
+  '@oxlint/binding-android-arm64@1.57.0':
     optional: true
 
-  '@oxlint/binding-darwin-arm64@1.50.0':
+  '@oxlint/binding-darwin-arm64@1.57.0':
     optional: true
 
-  '@oxlint/binding-darwin-x64@1.50.0':
+  '@oxlint/binding-darwin-x64@1.57.0':
     optional: true
 
-  '@oxlint/binding-freebsd-x64@1.50.0':
+  '@oxlint/binding-freebsd-x64@1.57.0':
     optional: true
 
-  '@oxlint/binding-linux-arm-gnueabihf@1.50.0':
+  '@oxlint/binding-linux-arm-gnueabihf@1.57.0':
     optional: true
 
-  '@oxlint/binding-linux-arm-musleabihf@1.50.0':
+  '@oxlint/binding-linux-arm-musleabihf@1.57.0':
     optional: true
 
-  '@oxlint/binding-linux-arm64-gnu@1.50.0':
+  '@oxlint/binding-linux-arm64-gnu@1.57.0':
     optional: true
 
-  '@oxlint/binding-linux-arm64-musl@1.50.0':
+  '@oxlint/binding-linux-arm64-musl@1.57.0':
     optional: true
 
-  '@oxlint/binding-linux-ppc64-gnu@1.50.0':
+  '@oxlint/binding-linux-ppc64-gnu@1.57.0':
     optional: true
 
-  '@oxlint/binding-linux-riscv64-gnu@1.50.0':
+  '@oxlint/binding-linux-riscv64-gnu@1.57.0':
     optional: true
 
-  '@oxlint/binding-linux-riscv64-musl@1.50.0':
+  '@oxlint/binding-linux-riscv64-musl@1.57.0':
     optional: true
 
-  '@oxlint/binding-linux-s390x-gnu@1.50.0':
+  '@oxlint/binding-linux-s390x-gnu@1.57.0':
     optional: true
 
-  '@oxlint/binding-linux-x64-gnu@1.50.0':
+  '@oxlint/binding-linux-x64-gnu@1.57.0':
     optional: true
 
-  '@oxlint/binding-linux-x64-musl@1.50.0':
+  '@oxlint/binding-linux-x64-musl@1.57.0':
     optional: true
 
-  '@oxlint/binding-openharmony-arm64@1.50.0':
+  '@oxlint/binding-openharmony-arm64@1.57.0':
     optional: true
 
-  '@oxlint/binding-win32-arm64-msvc@1.50.0':
+  '@oxlint/binding-win32-arm64-msvc@1.57.0':
     optional: true
 
-  '@oxlint/binding-win32-ia32-msvc@1.50.0':
+  '@oxlint/binding-win32-ia32-msvc@1.57.0':
     optional: true
 
-  '@oxlint/binding-win32-x64-msvc@1.50.0':
+  '@oxlint/binding-win32-x64-msvc@1.57.0':
     optional: true
 
   '@oxlint/plugins@1.43.0': {}
@@ -13100,7 +13117,7 @@ snapshots:
       detect-libc: 2.1.2
       is-glob: 4.0.3
       node-addon-api: 7.1.1
-      picomatch: 4.0.3
+      picomatch: 4.0.4
     optionalDependencies:
       '@parcel/watcher-android-arm64': 2.5.6
       '@parcel/watcher-darwin-arm64': 2.5.6
@@ -13339,14 +13356,14 @@ snapshots:
     dependencies:
       '@types/estree': 0.0.39
       estree-walker: 1.0.1
-      picomatch: 2.3.1
+      picomatch: 2.3.2
       rollup: 2.80.0
 
   '@rollup/pluginutils@5.3.0(rollup@2.80.0)':
     dependencies:
       '@types/estree': 1.0.8
       estree-walker: 2.0.2
-      picomatch: 4.0.3
+      picomatch: 4.0.4
     optionalDependencies:
       rollup: 2.80.0
 
@@ -13899,27 +13916,27 @@ snapshots:
       tailwindcss: 4.2.1
       vite: 8.0.1(@types/node@24.9.1)(esbuild@0.27.3)(jiti@2.6.1)(sass@1.70.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.2)
 
-  '@tanstack/db-ivm@0.1.17(typescript@6.0.0-beta)':
+  '@tanstack/db-ivm@0.1.17(typescript@6.0.2)':
     dependencies:
       fractional-indexing: 3.2.0
       sorted-btree: 1.8.1
-      typescript: 6.0.0-beta
+      typescript: 6.0.2
 
-  '@tanstack/db@0.5.30(typescript@6.0.0-beta)':
+  '@tanstack/db@0.5.30(typescript@6.0.2)':
     dependencies:
       '@standard-schema/spec': 1.1.0
-      '@tanstack/db-ivm': 0.1.17(typescript@6.0.0-beta)
+      '@tanstack/db-ivm': 0.1.17(typescript@6.0.2)
       '@tanstack/pacer-lite': 0.2.1
-      typescript: 6.0.0-beta
+      typescript: 6.0.2
 
   '@tanstack/devtools-event-client@0.4.1': {}
 
-  '@tanstack/eslint-plugin-query@5.91.4(eslint@9.39.1(jiti@2.6.1))(typescript@6.0.0-beta)':
+  '@tanstack/eslint-plugin-query@5.91.4(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.0-beta)
+      '@typescript-eslint/utils': 8.52.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.0-beta
+      typescript: 6.0.2
     transitivePeerDependencies:
       - supports-color
 
@@ -13935,19 +13952,19 @@ snapshots:
 
   '@tanstack/query-core@5.90.20': {}
 
-  '@tanstack/query-db-collection@1.0.27(@tanstack/query-core@5.90.20)(typescript@6.0.0-beta)':
+  '@tanstack/query-db-collection@1.0.27(@tanstack/query-core@5.90.20)(typescript@6.0.2)':
     dependencies:
       '@standard-schema/spec': 1.1.0
-      '@tanstack/db': 0.5.30(typescript@6.0.0-beta)
+      '@tanstack/db': 0.5.30(typescript@6.0.2)
       '@tanstack/query-core': 5.90.20
-      typescript: 6.0.0-beta
+      typescript: 6.0.2
 
   '@tanstack/query-devtools@5.93.0': {}
 
-  '@tanstack/solid-db@0.2.10(solid-js@1.9.10)(typescript@6.0.0-beta)':
+  '@tanstack/solid-db@0.2.10(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.0-beta)
+      '@tanstack/db': 0.5.30(typescript@6.0.2)
       solid-js: 1.9.10
     transitivePeerDependencies:
       - typescript
@@ -14318,12 +14335,12 @@ snapshots:
     dependencies:
       '@types/webidl-conversions': 7.0.3
 
-  '@typescript-eslint/project-service@8.52.0(typescript@6.0.0-beta)':
+  '@typescript-eslint/project-service@8.52.0(typescript@6.0.2)':
     dependencies:
-      '@typescript-eslint/tsconfig-utils': 8.52.0(typescript@6.0.0-beta)
+      '@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)
-      typescript: 6.0.0-beta
+      typescript: 6.0.2
     transitivePeerDependencies:
       - supports-color
 
@@ -14332,9 +14349,9 @@ snapshots:
       '@typescript-eslint/types': 8.52.0
       '@typescript-eslint/visitor-keys': 8.52.0
 
-  '@typescript-eslint/tsconfig-utils@8.52.0(typescript@6.0.0-beta)':
+  '@typescript-eslint/tsconfig-utils@8.52.0(typescript@6.0.2)':
     dependencies:
-      typescript: 6.0.0-beta
+      typescript: 6.0.2
 
   '@typescript-eslint/types@7.18.0': {}
 
@@ -14355,29 +14372,29 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/typescript-estree@8.52.0(typescript@6.0.0-beta)':
+  '@typescript-eslint/typescript-estree@8.52.0(typescript@6.0.2)':
     dependencies:
-      '@typescript-eslint/project-service': 8.52.0(typescript@6.0.0-beta)
-      '@typescript-eslint/tsconfig-utils': 8.52.0(typescript@6.0.0-beta)
+      '@typescript-eslint/project-service': 8.52.0(typescript@6.0.2)
+      '@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)
       minimatch: 9.0.9
       semver: 7.7.4
       tinyglobby: 0.2.15
-      ts-api-utils: 2.4.0(typescript@6.0.0-beta)
-      typescript: 6.0.0-beta
+      ts-api-utils: 2.4.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.0-beta)':
+  '@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))
       '@typescript-eslint/scope-manager': 8.52.0
       '@typescript-eslint/types': 8.52.0
-      '@typescript-eslint/typescript-estree': 8.52.0(typescript@6.0.0-beta)
+      '@typescript-eslint/typescript-estree': 8.52.0(typescript@6.0.2)
       eslint: 9.39.1(jiti@2.6.1)
-      typescript: 6.0.0-beta
+      typescript: 6.0.2
     transitivePeerDependencies:
       - supports-color
 
@@ -16300,16 +16317,16 @@ snapshots:
       lodash.memoize: 4.1.2
       semver: 7.7.3
 
-  eslint-plugin-solid@0.14.5(eslint@9.39.1(jiti@2.6.1))(typescript@6.0.0-beta):
+  eslint-plugin-solid@0.14.5(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.0-beta)
+      '@typescript-eslint/utils': 8.52.0(eslint@9.39.1(jiti@2.6.1))(typescript@6.0.2)
       eslint: 9.39.1(jiti@2.6.1)
       estraverse: 5.3.0
       is-html: 2.0.0
       kebab-case: 1.0.2
       known-css-properties: 0.30.0
       style-to-object: 1.0.14
-      typescript: 6.0.0-beta
+      typescript: 6.0.2
     transitivePeerDependencies:
       - supports-color
 
@@ -18318,7 +18335,7 @@ snapshots:
 
   lz-ts@1.1.2: {}
 
-  madge@8.0.0(typescript@6.0.0-beta):
+  madge@8.0.0(typescript@6.0.2):
     dependencies:
       chalk: 4.1.2
       commander: 7.2.0
@@ -18333,7 +18350,7 @@ snapshots:
       ts-graphviz: 2.1.2
       walkdir: 0.4.1
     optionalDependencies:
-      typescript: 6.0.0-beta
+      typescript: 6.0.2
     transitivePeerDependencies:
       - supports-color
 
@@ -19281,61 +19298,61 @@ snapshots:
       object-keys: 1.1.1
       safe-push-apply: 1.0.0
 
-  oxfmt@0.35.0:
+  oxfmt@0.42.0:
     dependencies:
       tinypool: 2.1.0
     optionalDependencies:
-      '@oxfmt/binding-android-arm-eabi': 0.35.0
-      '@oxfmt/binding-android-arm64': 0.35.0
-      '@oxfmt/binding-darwin-arm64': 0.35.0
-      '@oxfmt/binding-darwin-x64': 0.35.0
-      '@oxfmt/binding-freebsd-x64': 0.35.0
-      '@oxfmt/binding-linux-arm-gnueabihf': 0.35.0
-      '@oxfmt/binding-linux-arm-musleabihf': 0.35.0
-      '@oxfmt/binding-linux-arm64-gnu': 0.35.0
-      '@oxfmt/binding-linux-arm64-musl': 0.35.0
-      '@oxfmt/binding-linux-ppc64-gnu': 0.35.0
-      '@oxfmt/binding-linux-riscv64-gnu': 0.35.0
-      '@oxfmt/binding-linux-riscv64-musl': 0.35.0
-      '@oxfmt/binding-linux-s390x-gnu': 0.35.0
-      '@oxfmt/binding-linux-x64-gnu': 0.35.0
-      '@oxfmt/binding-linux-x64-musl': 0.35.0
-      '@oxfmt/binding-openharmony-arm64': 0.35.0
-      '@oxfmt/binding-win32-arm64-msvc': 0.35.0
-      '@oxfmt/binding-win32-ia32-msvc': 0.35.0
-      '@oxfmt/binding-win32-x64-msvc': 0.35.0
-
-  oxlint-tsgolint@0.14.2:
+      '@oxfmt/binding-android-arm-eabi': 0.42.0
+      '@oxfmt/binding-android-arm64': 0.42.0
+      '@oxfmt/binding-darwin-arm64': 0.42.0
+      '@oxfmt/binding-darwin-x64': 0.42.0
+      '@oxfmt/binding-freebsd-x64': 0.42.0
+      '@oxfmt/binding-linux-arm-gnueabihf': 0.42.0
+      '@oxfmt/binding-linux-arm-musleabihf': 0.42.0
+      '@oxfmt/binding-linux-arm64-gnu': 0.42.0
+      '@oxfmt/binding-linux-arm64-musl': 0.42.0
+      '@oxfmt/binding-linux-ppc64-gnu': 0.42.0
+      '@oxfmt/binding-linux-riscv64-gnu': 0.42.0
+      '@oxfmt/binding-linux-riscv64-musl': 0.42.0
+      '@oxfmt/binding-linux-s390x-gnu': 0.42.0
+      '@oxfmt/binding-linux-x64-gnu': 0.42.0
+      '@oxfmt/binding-linux-x64-musl': 0.42.0
+      '@oxfmt/binding-openharmony-arm64': 0.42.0
+      '@oxfmt/binding-win32-arm64-msvc': 0.42.0
+      '@oxfmt/binding-win32-ia32-msvc': 0.42.0
+      '@oxfmt/binding-win32-x64-msvc': 0.42.0
+
+  oxlint-tsgolint@0.17.3:
     optionalDependencies:
-      '@oxlint-tsgolint/darwin-arm64': 0.14.2
-      '@oxlint-tsgolint/darwin-x64': 0.14.2
-      '@oxlint-tsgolint/linux-arm64': 0.14.2
-      '@oxlint-tsgolint/linux-x64': 0.14.2
-      '@oxlint-tsgolint/win32-arm64': 0.14.2
-      '@oxlint-tsgolint/win32-x64': 0.14.2
-
-  oxlint@1.50.0(oxlint-tsgolint@0.14.2):
+      '@oxlint-tsgolint/darwin-arm64': 0.17.3
+      '@oxlint-tsgolint/darwin-x64': 0.17.3
+      '@oxlint-tsgolint/linux-arm64': 0.17.3
+      '@oxlint-tsgolint/linux-x64': 0.17.3
+      '@oxlint-tsgolint/win32-arm64': 0.17.3
+      '@oxlint-tsgolint/win32-x64': 0.17.3
+
+  oxlint@1.57.0(oxlint-tsgolint@0.17.3):
     optionalDependencies:
-      '@oxlint/binding-android-arm-eabi': 1.50.0
-      '@oxlint/binding-android-arm64': 1.50.0
-      '@oxlint/binding-darwin-arm64': 1.50.0
-      '@oxlint/binding-darwin-x64': 1.50.0
-      '@oxlint/binding-freebsd-x64': 1.50.0
-      '@oxlint/binding-linux-arm-gnueabihf': 1.50.0
-      '@oxlint/binding-linux-arm-musleabihf': 1.50.0
-      '@oxlint/binding-linux-arm64-gnu': 1.50.0
-      '@oxlint/binding-linux-arm64-musl': 1.50.0
-      '@oxlint/binding-linux-ppc64-gnu': 1.50.0
-      '@oxlint/binding-linux-riscv64-gnu': 1.50.0
-      '@oxlint/binding-linux-riscv64-musl': 1.50.0
-      '@oxlint/binding-linux-s390x-gnu': 1.50.0
-      '@oxlint/binding-linux-x64-gnu': 1.50.0
-      '@oxlint/binding-linux-x64-musl': 1.50.0
-      '@oxlint/binding-openharmony-arm64': 1.50.0
-      '@oxlint/binding-win32-arm64-msvc': 1.50.0
-      '@oxlint/binding-win32-ia32-msvc': 1.50.0
-      '@oxlint/binding-win32-x64-msvc': 1.50.0
-      oxlint-tsgolint: 0.14.2
+      '@oxlint/binding-android-arm-eabi': 1.57.0
+      '@oxlint/binding-android-arm64': 1.57.0
+      '@oxlint/binding-darwin-arm64': 1.57.0
+      '@oxlint/binding-darwin-x64': 1.57.0
+      '@oxlint/binding-freebsd-x64': 1.57.0
+      '@oxlint/binding-linux-arm-gnueabihf': 1.57.0
+      '@oxlint/binding-linux-arm-musleabihf': 1.57.0
+      '@oxlint/binding-linux-arm64-gnu': 1.57.0
+      '@oxlint/binding-linux-arm64-musl': 1.57.0
+      '@oxlint/binding-linux-ppc64-gnu': 1.57.0
+      '@oxlint/binding-linux-riscv64-gnu': 1.57.0
+      '@oxlint/binding-linux-riscv64-musl': 1.57.0
+      '@oxlint/binding-linux-s390x-gnu': 1.57.0
+      '@oxlint/binding-linux-x64-gnu': 1.57.0
+      '@oxlint/binding-linux-x64-musl': 1.57.0
+      '@oxlint/binding-openharmony-arm64': 1.57.0
+      '@oxlint/binding-win32-arm64-msvc': 1.57.0
+      '@oxlint/binding-win32-ia32-msvc': 1.57.0
+      '@oxlint/binding-win32-x64-msvc': 1.57.0
+      oxlint-tsgolint: 0.17.3
 
   p-defer@3.0.0: {}
 
@@ -19532,8 +19549,12 @@ snapshots:
 
   picomatch@2.3.1: {}
 
+  picomatch@2.3.2: {}
+
   picomatch@4.0.3: {}
 
+  picomatch@4.0.4: {}
+
   pidtree@0.6.0: {}
 
   pino-std-serializers@3.2.0: {}
@@ -19815,9 +19836,9 @@ snapshots:
       - supports-color
     optional: true
 
-  react-docgen-typescript@2.4.0(typescript@6.0.0-beta):
+  react-docgen-typescript@2.4.0(typescript@6.0.2):
     dependencies:
-      typescript: 6.0.0-beta
+      typescript: 6.0.2
 
   react-dom@18.3.1(react@18.3.1):
     dependencies:
@@ -20677,9 +20698,9 @@ snapshots:
       es-errors: 1.3.0
       internal-slot: 1.1.0
 
-  storybook-solidjs-vite@10.0.9(@testing-library/jest-dom@6.9.1)(esbuild@0.27.3)(rollup@4.52.5)(solid-js@1.9.11)(storybook@10.2.16(@testing-library/dom@10.4.1)(prettier@3.7.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@6.0.0-beta)(vite@7.3.1(@types/node@24.9.1)(jiti@2.6.1)(lightningcss@1.32.0)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.2)):
+  storybook-solidjs-vite@10.0.9(@testing-library/jest-dom@6.9.1)(esbuild@0.27.3)(rollup@4.52.5)(solid-js@1.9.11)(storybook@10.2.16(@testing-library/dom@10.4.1)(prettier@3.7.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@6.0.2)(vite@7.3.1(@types/node@24.9.1)(jiti@2.6.1)(lightningcss@1.32.0)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.2)):
     dependencies:
-      '@joshwooding/vite-plugin-react-docgen-typescript': 0.6.4(typescript@6.0.0-beta)(vite@7.3.1(@types/node@24.9.1)(jiti@2.6.1)(lightningcss@1.32.0)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.2))
+      '@joshwooding/vite-plugin-react-docgen-typescript': 0.6.4(typescript@6.0.2)(vite@7.3.1(@types/node@24.9.1)(jiti@2.6.1)(lightningcss@1.32.0)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.2))
       '@storybook/builder-vite': 10.2.16(esbuild@0.27.3)(rollup@4.52.5)(storybook@10.2.16(@testing-library/dom@10.4.1)(prettier@3.7.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(vite@7.3.1(@types/node@24.9.1)(jiti@2.6.1)(lightningcss@1.32.0)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.2))
       '@storybook/global': 5.0.0
       solid-js: 1.9.11
@@ -20687,7 +20708,7 @@ snapshots:
       vite: 7.3.1(@types/node@24.9.1)(jiti@2.6.1)(lightningcss@1.32.0)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.2)
       vite-plugin-solid: 2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.11)(vite@7.3.1(@types/node@24.9.1)(jiti@2.6.1)(lightningcss@1.32.0)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.2))
     optionalDependencies:
-      typescript: 6.0.0-beta
+      typescript: 6.0.2
     transitivePeerDependencies:
       - '@testing-library/jest-dom'
       - esbuild
@@ -21216,9 +21237,9 @@ snapshots:
     dependencies:
       typescript: 5.9.3
 
-  ts-api-utils@2.4.0(typescript@6.0.0-beta):
+  ts-api-utils@2.4.0(typescript@6.0.2):
     dependencies:
-      typescript: 6.0.0-beta
+      typescript: 6.0.2
 
   ts-dedent@2.2.0: {}
 
@@ -21288,6 +21309,33 @@ snapshots:
       - tsx
       - yaml
 
+  tsup@8.4.0(jiti@2.6.1)(postcss@8.5.8)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.2):
+    dependencies:
+      bundle-require: 5.1.0(esbuild@0.25.11)
+      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
+      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.2)
+      resolve-from: 5.0.0
+      rollup: 4.52.5
+      source-map: 0.8.0-beta.0
+      sucrase: 3.35.0
+      tinyexec: 0.3.2
+      tinyglobby: 0.2.15
+      tree-kill: 1.2.2
+    optionalDependencies:
+      postcss: 8.5.8
+      typescript: 6.0.2
+    transitivePeerDependencies:
+      - jiti
+      - supports-color
+      - tsx
+      - yaml
+
   tsx@4.21.0:
     dependencies:
       esbuild: 0.27.3
@@ -21392,7 +21440,10 @@ snapshots:
 
   typescript@5.9.3: {}
 
-  typescript@6.0.0-beta: {}
+  typescript@6.0.0-beta:
+    optional: true
+
+  typescript@6.0.2: {}
 
   ua-parser-js@0.7.33: {}